Merge branch 'develop' into feature/service-changes
This commit is contained in:
commit
9eb14614c2
20 changed files with 345 additions and 70 deletions
|
@ -64,7 +64,7 @@
|
|||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="/">{{ Settings::get('company') }}</a>
|
||||
<a class="navbar-brand" href="/">{{ Settings::get('company', 'Pterodactyl Panel') }}</a>
|
||||
</div>
|
||||
<div class="navbar-collapse collapse navbar-responsive-collapse">
|
||||
@section('navbar-links')
|
||||
|
|
Reference in a new issue