Skip to content
Snippets Groups Projects
Commit d5870142 authored by Florian Azizian's avatar Florian Azizian
Browse files

Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

parents 2fdc9b7f db280895
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,7 @@ class MergedJsAbstract { ...@@ -49,7 +49,7 @@ class MergedJsAbstract {
//TODO clean //TODO clean
readfile('apps/maarch_entreprise/js/chosen.proto.min.js'); readfile('apps/maarch_entreprise/js/chosen.proto.min.js');
readfile('apps/maarch_entreprise/js/scrollbox.js'); readfile('apps/maarch_entreprise/js/scrollbox.js');
// readfile('apps/maarch_entreprise/js/event.simulate.js'); // TODO Remove after test readfile('apps/maarch_entreprise/js/event.simulate.js'); // Works with chosen proto
// readfile('apps/maarch_entreprise/js/keypress.js'); // TODO Remove after test // readfile('apps/maarch_entreprise/js/keypress.js'); // TODO Remove after test
readfile('apps/maarch_entreprise/js/tabricator.js'); readfile('apps/maarch_entreprise/js/tabricator.js');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment