MrUnknownDE/panel
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/panel.git synced 2026-04-25 01:33:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/admin-retheme

Browse Source 
# Conflicts:
#	public/themes/pterodactyl/css/pterodactyl.css
This commit is contained in:
Dane Everitt
2017-03-03 17:35:04 -05:00
parent b301b89459 500cf7fdb3
commit 799f2ee6d9
22 changed files with 10923 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,7 @@
</div>
@section('footer-scripts')
{!! Theme::js('js/laroute.js') !!}
{!! Theme::js('js/vendor/jquery/jquery.min.js') !!}
{!! Theme::js('vendor/jquery/jquery.min.js') !!}
{!! Theme::js('vendor/sweetalert/sweetalert.min.js') !!}
{!! Theme::js('vendor/bootstrap/bootstrap.min.js') !!}
{!! Theme::js('vendor/slimscroll/jquery.slimscroll.min.js') !!}