Skip to content
Snippets Groups Projects
Commit c27feb2e authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge branch '296-gulp-fur-js' into 'development'

Neuer Library Ordner für JS und production-kompiliert

Closes #296

See merge request !490
parents 6a4896c5 27250967
Branches
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
......@@ -12,5 +12,5 @@ require('laravel-elixir-vue-2');
*/
elixir(function(mix) {
mix.less('default.less', 'public/css/themes/default.css');
mix.scripts(['jquery.js', 'bootstrap.js', 'widgets.js', 'editLanguage.js', 'kontakt.js', 'lightslider.js', 'masonry.js', 'imagesloaded.js', 'openpgp.min.js', 'scriptResultPage.js', 'scriptStartPage.js', 'settings.js' /*, '/vue/app.js', '/vue/bootstrap.js'*/ ]);
mix.scripts(['lib/jquery.js', 'lib/bootstrap.js', 'widgets.js', 'editLanguage.js', 'kontakt.js', 'lib/lightslider.js', 'lib/masonry.js', 'lib/imagesloaded.js', 'lib/openpgp.min.js', 'scriptResultPage.js', 'scriptStartPage.js', 'settings.js' /*, 'lib/vue/app.js', 'lib/vue/bootstrap.js'*/ ]);
});
\ No newline at end of file
This diff is collapsed.
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment