Commit 6a4896c5 authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

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

Die Bildersuche wird jetzt auch wieder sortiert



See merge request !489
parents 33a80cbc 8b4dead8
......@@ -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', 'openpgp.min.js', 'scriptResultPage.js', 'scriptStartPage.js', 'settings.js' /*, '/vue/app.js', '/vue/bootstrap.js'*/ ]);
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'*/ ]);
});
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment