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 copyright headers	2017-01-24 17:57:08 -05:00
plugins/minecraft	switch to jQuery 3.1.1 on new theme	2017-01-29 01:20:37 +01:00
vendor	More singularization and correct file names.	2017-02-12 16:03:17 -05:00
admin.min.js	Update copyright headers	2017-01-24 17:57:08 -05:00
filemanager.min.js	Revert "Select the whole field when renaming a file."	2017-01-03 17:39:28 -05:00
filemanager.min.js.map	Update copyright headers	2017-01-24 17:57:08 -05:00
jquery.mousewheel-min.js	Add a better console page	2016-09-16 15:48:17 -04:00
jquery.terminal-0.11.23.min.js	update jquery.terminal to v0.11.23	2016-12-10 13:51:07 +01:00
laroute.js	Fix up email sending and add more notifications to the panel.	2017-02-17 19:23:27 -05:00
phraseapp.js	move phraseapp js into own file	2017-02-02 15:30:40 +01:00
unix_formatting.js	Add a better console page	2016-09-16 15:48:17 -04:00