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

..

admin.blade.php

Implement node view, cleanup other files.

2017-03-03 17:30:41 -05:00

auth.blade.php

Merge branch 'develop' into feature/new-theme

2017-03-03 23:08:24 +01:00

error.blade.php

Merge branch 'develop' into feature/new-theme

2017-03-03 23:08:24 +01:00

master.blade.php

Merge branch 'develop' into feature/admin-retheme

2017-03-03 17:35:04 -05:00