This repository has been archived on 2025-05-09. You can view files and clone it, but you cannot make any changes to it's state, such as pushing and creating new issues, pull requests or comments.

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