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

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2013-11-12 13:26:15 +01:00
parent 89fb774f96 e48c2cc158
commit 3cf2cbd6f1
78 changed files with 5184 additions and 6309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/scripts/apps/admin/fields/main.js
View File

@@ -19,7 +19,7 @@ require.config({
bootstrap: "../assets/bootstrap/js/bootstrap.min"
},
shim: {
bootstrap : ["jquery"],
bootstrap: ["jquery"],
jqueryui: {
deps: [ "jquery" ]
}
@@ -27,6 +27,6 @@ require.config({
});
// launch application
require(["apps/admin/fields/app"], function(App) {
require(["apps/admin/fields/app"], function (App) {
App.initialize();
});