Merge branch 'develop' of github.com:Pterodactyl/Panel into improve-password-reset

This commit is contained in:
Jakob Schrettenbrunner 2017-03-31 12:20:41 +02:00
commit 207e0131fc
18 changed files with 414 additions and 828 deletions

View file

@ -14,8 +14,7 @@ return [
|
*/
'bind_js_vars_to_this_view' => [
'layouts.master',
'layouts.admin',
'layouts.scripts',
],
/*