diff --git a/bower.json b/bower.json index f3119799cc..dda2f156a8 100644 --- a/bower.json +++ b/bower.json @@ -15,12 +15,11 @@ ], "dependencies": { "jquery": "~2.0.3", - "bootstrap": "v2.3.2", "angular": "1.2.0-rc.1", "angular-resource": "1.2.0-rc.1", "angular-ui": "~0.4.0", "angular-bootstrap": "~0.5.0", - "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#master", + "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#rewrite", "lodash": "~1.3.1", "moment": "~2.1.0", "bootstrap-tour": "~0.5.1", @@ -30,6 +29,11 @@ "bootstrap-growl": "~1.1.0", "jquery.cookie": "~1.3.1", "sticky": "*", - "bootstrap-datepicker": "~1.2.0" + "bootstrap-datepicker": "~1.2.0", + "bootstrap": "v2.3.2" + }, + "resolutions": { + "jquery": "~2.0.3", + "bootstrap": "v2.3.2" } } diff --git a/package.json b/package.json index 7da53eb752..1fde71bdc7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitrpg", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "0.0.0-151", + "version": "0.0.0-152", "main": "./server.js", "dependencies": { "habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared#rewrite", @@ -43,6 +43,6 @@ "scripts": { "start": "nodemon src/server.coffee", "test": "mocha test/api.mocha.coffee", - "postinstall": "./node_modules/bower/bin/bower install" + "postinstall": "./node_modules/bower/bin/bower install -f" } }