Dane Everitt 799f2ee6d9 Merge branch 'develop' into feature/admin-retheme ... # Conflicts: # public/themes/pterodactyl/css/pterodactyl.css		2017-03-03 17:35:04 -05:00
..
lang/en	Merge branch 'develop' into feature/new-theme	2017-03-03 23:08:24 +01:00
themes	Merge branch 'develop' into feature/admin-retheme	2017-03-03 17:35:04 -05:00
views	Add back manage and delete tabs to server view	2017-02-25 14:14:07 -05:00