git merge Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into translations

2013-11-12 14:54:17 +01:00
parent 1d9148eebb 32a94871d2
commit 7eaed0348f
13 changed files with 150 additions and 51 deletions
@@ -33,7 +33,8 @@
    "BrowserQuest": "https://github.com/mozilla/BrowserQuest.git",
    "github-buttons": "git://github.com/mdo/github-buttons.git",
    "marked": "~0.2.9",
-    "JavaScriptButtons": "git://github.com/paypal/JavaScriptButtons.git#master"
+    "JavaScriptButtons": "git://github.com/paypal/JavaScriptButtons.git#master",
+    "Angular-At-Directive": "git://github.com/scarletsky/Angular-At-Directive.git#master"
  },
  "resolutions": {
    "jquery": "~2.0.3",