Merge branch 'common-convert' of github.com:HabitRPG/habitrpg into common-convert

2015-01-23 15:30:28 -06:00
parent 4588be29ee 37c7bd8df1
commit dfb43af003
2 changed files with 0 additions and 2 deletions
@@ -27,7 +27,6 @@
    "bootstrap": "~3.1.0",
    "bootstrap-growl": "git://github.com/ifightcrime/bootstrap-growl.git#master",
    "bootstrap-tour": "~0.8.1",
-    "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#develop",
    "BrowserQuest": "git://github.com/browserquest/BrowserQuest.git",
    "github-buttons": "git://github.com/mdo/github-buttons.git",
    "marked": "~0.2.9",
@@ -28,7 +28,6 @@
    "grunt-contrib-watch": "~0.6.1",
    "grunt-hashres": "~0.4.1",
    "grunt-nodemon": "~0.3.0",
-    "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#develop",
    "icalendar": "git://github.com/lefnire/node-icalendar#master",
    "in-app-purchase": "^0.2.0",
    "jade": "~1.7.0",