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	allow to use the username for login as well	2017-02-16 20:40:21 +01:00
base	Add back API key deletion	2017-02-16 12:57:48 -05:00
errors	Update copyright headers	2017-01-24 17:57:08 -05:00
layouts	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
server	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
vendor	Initial change of theme.	2017-01-14 21:32:33 -05:00