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
..
css	node status in list, closes #124	2016-10-07 15:15:04 -04:00
js	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
themes	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
.htaccess	Only apache could manage to do something this ridiculous	2017-02-18 12:47:49 -05:00
index.php	Apply fixes from StyleCI	2016-12-07 22:46:38 +00:00
robots.txt	Initial Commit of Files	2015-12-06 13:58:49 -05:00