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

Merge branch 'develop' into feature/updated-models

Browse Source
This commit is contained in:
Dane Everitt
2017-02-02 19:47:10 -05:00
committed by GitHub
parent 533e2bcafb 8cac2a3669
commit 242294598f
7 changed files with 123 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/themes/pterodactyl/layouts/auth.blade.php
View File

@@ -49,5 +49,7 @@
</div>
{!! Theme::js('js/vendor/jquery/jquery.min.js') !!}
{!! Theme::js('vendor/bootstrap/bootstrap.min.js') !!}
@if(config('app.phrase_in_context')) {!! Theme::js('js/phraseapp.js') !!} @endif
</body>
</html>

2
resources/themes/pterodactyl/layouts/master.blade.php
View File

@@ -281,6 +281,8 @@
{!! Theme::js('vendor/adminlte/app.min.js') !!}
{!! Theme::js('js/vendor/socketio/socket.io.min.js') !!}
{!! Theme::js('vendor/bootstrap-notify/bootstrap-notify.min.js') !!}
@if(config('app.phrase_in_context')) {!! Theme::js('js/phraseapp.js') !!} @endif
@show
</body>
</html>