Merge branch 'develop' into feature/new-theme

Browse source

# Conflicts:
#	.gitignore
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
#	public/themes/pterodactyl/js/frontend/serverlist.js
#	resources/themes/pterodactyl/server/files/list.blade.php

...

This commit is contained in:

Jakob Schrettenbrunner 2017-03-03 23:08:24 +01:00

parent f6d5ffaebb c021872a9c

commit 3a88deb97a

170 changed files with 9023 additions and 2222 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

public/themes/pterodactyl/vendor/adminlte/app.min.js vendored

View file

File diff suppressed because one or more lines are too long