Merge branch 'master' of github.com:lefnire/habitrpg into ui-tweaks

2013-03-15 12:09:35 -04:00
parent fd01da4f71 1e5ec6f176
commit a4efbe34df
15 changed files with 683 additions and 598 deletions
@@ -4,7 +4,7 @@
  "version": "0.0.0-150",
  "main": "./server.js",
  "dependencies": {
-    "derby": "git://github.com/lefnire/derby#habitrpg",
+    "derby": "git://github.com/Unroll-Me/derby#master",
    "racer": "git://github.com/lefnire/racer#habitrpg",
    "racer-db-mongo": "git://github.com/lefnire/racer-db-mongo#habitrpg",
    "derby-ui-boot": "git://github.com/codeparty/derby-ui-boot#master",