MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-19 14:53:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/service-changes

Browse Source
This commit is contained in:
Dane Everitt
2016-11-27 14:01:13 -05:00
parent 5a0f58ce90 f6275058d0
commit 9eb14614c2
20 changed files with 345 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/layouts/admin.blade.php
View File

@@ -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')

2
resources/views/layouts/master.blade.php
View File

@@ -164,7 +164,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('server-name')