This repository has been archived on 2025-05-09. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.

Jakob Schrettenbrunner 3a88deb97a Merge branch 'develop' into feature/new-theme ... # 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		2017-03-03 23:08:24 +01:00
..
auth.blade.php	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
error.blade.php	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
master.blade.php	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00