Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop

This commit is contained in:
Blade Barringer 2015-07-05 22:06:04 -05:00
commit fb5ad3830c

View file

@ -14,34 +14,34 @@
"tests"
],
"dependencies": {
"jquery": "~2.1.0",
"jquery.cookie": "~1.4.0",
"angular": "1.3.9",
"angular-ui": "~0.4.0",
"angular-sanitize": "1.3.9",
"angular-resource": "1.3.9",
"angular-ui-utils": "~0.1.0",
"angular-bootstrap": "~0.13.0",
"angular-loading-bar": "~0.6.0",
"bootstrap": "~3.1.0",
"bootstrap-tour": "~0.10.1",
"marked": "~0.2.9",
"sticky": "*",
"swagger-ui": "wordnik/swagger-ui#v2.0.24",
"ngInfiniteScroll": "1.0.0",
"jquery-colorbox": "~1.4.36",
"pnotify": "~1.3.1",
"jquery-ui": "~1.10.3",
"hello": "~1.5.0",
"css-social-buttons": "samcollins/css-social-buttons#v1.1.1 ",
"angular-filter": "~0.5.1",
"angular-ui-router": "~0.2.13",
"js-emoji": "snicker/js-emoji#f25d8a303f",
"Angular-At-Directive": "snicker/Angular-At-Directive#c27bae207aa06d1e",
"angular-ui-select2": "angular-ui/ui-select2#afa6589a54cb72815f",
"bootstrap-growl": "ifightcrime/bootstrap-growl#162daa41cd1155f",
"BrowserQuest": "browserquest/BrowserQuest#c3a960b03031dad5d",
"github-buttons": "mdo/github-buttons#v3.0.0"
"angular": "1.3.9",
"angular-bootstrap": "~0.13.0",
"angular-filter": "~0.5.1",
"angular-loading-bar": "~0.6.0",
"angular-resource": "1.3.9",
"angular-sanitize": "1.3.9",
"angular-ui": "~0.4.0",
"angular-ui-router": "~0.2.13",
"angular-ui-select2": "angular-ui/ui-select2#afa6589a54cb72815f",
"angular-ui-utils": "~0.1.0",
"bootstrap": "~3.1.0",
"bootstrap-growl": "ifightcrime/bootstrap-growl#162daa41cd1155f",
"bootstrap-tour": "~0.10.1",
"css-social-buttons": "samcollins/css-social-buttons#v1.1.1 ",
"github-buttons": "mdo/github-buttons#v3.0.0",
"hello": "~1.5.0",
"jquery": "~2.1.0",
"jquery-colorbox": "~1.4.36",
"jquery-ui": "~1.10.3",
"jquery.cookie": "~1.4.0",
"js-emoji": "snicker/js-emoji#f25d8a303f",
"marked": "~0.2.9",
"ngInfiniteScroll": "1.0.0",
"pnotify": "~1.3.1",
"sticky": "*",
"swagger-ui": "wordnik/swagger-ui#v2.0.24"
},
"devDependencies": {
"angular-mocks": "1.3.9"