sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-20 02:34:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tyler Renelle 2013-09-09 09:12:18 -04:00
commit f5ecef7c34
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bower.json
View file

@ -20,7 +20,7 @@
"angular-ui": "~0.4.0",
"angular-bootstrap": "~0.5.0",
"habitrpg-shared": "git://github.com/HabitRPG/habitrpg-shared.git#rewrite",
"bootstrap-tour": "~0.5.1",
"bootstrap-tour": "0.5.0",
"BrowserQuest": "https://github.com/mozilla/BrowserQuest.git",
"github-buttons": "git://github.com/mdo/github-buttons.git",
"jquery-ui": "~1.10.3",
@ -34,7 +34,6 @@
"angular-sanitize": "1.2.0-rc.1"
},
"resolutions": {
"jquery": "~2.0.3",
"bootstrap": "v2.3.2"
"jquery": "~2.0.3"
}
}