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

Merge branch '109-sprachschalter-temporar-entfernen' into 'development'

Resolve "Sprachschalter temporär entfernen"

Closes #109

See merge request !109
parents 0b4c725b bb95439e
No related branches found
No related tags found
1 merge request!1365Resolve "Filter Options for MetaGer"
This diff is collapsed.
...@@ -116,7 +116,7 @@ return [ ...@@ -116,7 +116,7 @@ return [
], ],
'redisLogs' => [ 'redisLogs' => [
'host' => env('REDIS_LOGS_HOST', 'localhost'), 'host' => env('REDIS_LOGS_HOST', 'localhost'),
'password' => env('REDIS_LOGS_PASSWORD', null), 'password' => env('REDIS_LOGS_PASSWORD', env('REDIS_PASSWORD', null)),
'port' => env('REDIS_MAIN_PORT', 6379), 'port' => env('REDIS_MAIN_PORT', 6379),
'database' => 1, 'database' => 1,
], ],
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<li><a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43" target="_blank">{{ trans('staticPages.nav14') }}</a></li> <li><a href="http://forum.suma-ev.de/viewtopic.php?f=3&amp;t=43" target="_blank">{{ trans('staticPages.nav14') }}</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown"> <!--<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }} <a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }}
<span class="caret"></span></a> <span class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li> <li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li>
@endforeach @endforeach
</ul> </ul>
</li> </li>-->
</ul> </ul>
</div> </div>
</div> </div>
......
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