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
..
css	Merge branch 'develop' into feature/admin-retheme	2017-03-03 17:35:04 -05:00
js	Merge branch 'develop' into feature/admin-retheme	2017-03-03 17:35:04 -05:00
vendor	Merge branch 'develop' into feature/admin-retheme	2017-03-03 17:35:04 -05:00