Skip to content
Snippets Groups Projects
Commit 69f1b394 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch...

Merge branch '774-languages-und-synoptic-seite-returnen-500-internal-server-error' into 'development'

Resolve "/languages und /synoptic Seite returnen 500 Internal Server Error"

Closes #774

See merge request !1277
parents e99e7af2 0b0fd06d
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
return [ return [
'title' => 'Youth protection', 'title' => 'Youth protection',
'text' => 'We deliver search results to very different scopes of the internet. Some of these are not suitable for people of your age. If you want to find something anyway, try using other search engines- <a href="https://www.blinde-kuh.de/">Blinde Kuh</a> for example. 'text' => 'We deliver search results to very different scopes of the internet. Some of these are not suitable for people of your age. If you want to find something anyway, try using other search engines- <a href="https://www.blinde-kuh.de/">Blinde Kuh</a> for example.',
]; ];
\ No newline at end of file
...@@ -32,6 +32,7 @@ mix ...@@ -32,6 +32,7 @@ mix
.babel('resources/assets/js/searchbar.js', 'public/js/searchbar.js') .babel('resources/assets/js/searchbar.js', 'public/js/searchbar.js')
.babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js') .babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
.babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js') .babel('resources/assets/js/focus-creator.js', 'public/js/focus-creator.js')
.babel('resources/assets/js/editLanguage.js', 'public/js/editLanguage.js')
// utility // utility
.babel(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js') .babel(['resources/assets/js/utility.js', 'resources/assets/js/translations.js'], 'public/js/utility.js')
.babel('resources/assets/js/widgets.js', 'public/js/widgets.js') .babel('resources/assets/js/widgets.js', 'public/js/widgets.js')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment