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
..
en	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00