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	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
2fa-modal.js	convert frontend javascript into revealing module pattern	2017-01-27 00:44:28 +01:00
console.js	add console notification on new output that is out of view	2017-01-26 22:57:33 +01:00
server.socket.js	convert frontend javascript into revealing module pattern	2017-01-27 00:44:28 +01:00
serverlist.js	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
tasks.js	convert frontend javascript into revealing module pattern	2017-01-27 00:44:28 +01:00