hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	bower.json
This commit is contained in:
Nicolas Le Goff
2014-03-13 17:30:04 +01:00
parent 244a845752 6d79e44c9a
commit 2a85f77365
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bower.json
View File

@@ -2,7 +2,7 @@
"name": "Phraseanet",
"version": "3.9.0",
"dependencies": {
"bootstrap": "~2.2.2",
"bootstrap": "2.3.2",
"jquery": "~1.8.3",
"jquery.ui": "~1.10.0",
"jquery-mobile": "~1.3.0",
@@ -17,7 +17,7 @@
"backbone-amd": "~1.0",
"underscore-amd": "~1.4",
"i18next": "~1.6",
"bootstrap-multiselect": "https://github.com/davidstutz/bootstrap-multiselect.git#bootstrap-2-3",
"bootstrap-multiselect": "v0.9",
"zxcvbn": "https://github.com/lowe/zxcvbn.git",
"geonames-server-jquery-plugin": "~0.2",
"swfobject": "latest",