ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2072 from emanuelschuetze/fix2064

Browse Source 
Order of jquery and angular in bower.json is important (Fixes #2064).
This commit is contained in:
Norman Jäckel 2016-04-11 17:29:29 +02:00
commit 8a03c15c35
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bower.json
View File

@ -2,11 +2,12 @@
"name": "OpenSlides", "name": "OpenSlides",
"private": true, "private": true,
"dependencies": { "dependencies": {
"jquery": "~2.2.3",
"angular": "~1.4.9", "angular": "~1.4.9",
"angular-animate": "~1.4.9", "angular-animate": "~1.4.9",
"angular-bootstrap": "~0.14.3", "angular-bootstrap": "~0.14.3",
"angular-bootstrap-colorpicker": "~3.0.24", "angular-bootstrap-colorpicker": "~3.0.24",
"angular-chosen-localytics": "~1.3.0", "angular-chosen-localytics": "~1.4.0",
"angular-csv-import": "~0.0.27", "angular-csv-import": "~0.0.27",
"angular-formly": "~7.3.9", "angular-formly": "~7.3.9",
"angular-formly-templates-bootstrap": "~6.2.0", "angular-formly-templates-bootstrap": "~6.2.0",
@ -21,7 +22,6 @@
"angular-ui-tree": "~2.5.0", "angular-ui-tree": "~2.5.0",
"bootstrap-css-only": "~3.3.6", "bootstrap-css-only": "~3.3.6",
"font-awesome-bower": "~4.5.0", "font-awesome-bower": "~4.5.0",
"jquery": "~2.2.0",
"jquery.cookie": "~1.4.1", "jquery.cookie": "~1.4.1",
"js-data": "~2.8.2", "js-data": "~2.8.2",
"js-data-angular": "~3.1.0", "js-data-angular": "~3.1.0",