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
..
files	Update filemanager to be a little cleaner	2017-02-17 13:08:07 -05:00
settings	Complete implementation of new Server model.	2017-02-02 19:41:38 -05:00
tasks	Update copyright headers	2017-01-24 17:57:08 -05:00
users	Fix up email sending and add more notifications to the panel.	2017-02-17 19:23:27 -05:00
index.blade.php	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00