Dane Everitt 800e2df6b2

Merge branch 'develop' into feature/api-v1 ...

# Conflicts:
#	app/Contracts/Repository/RepositoryInterface.php
#	app/Repositories/Eloquent/EloquentRepository.php
#	app/Services/Nodes/NodeUpdateService.php
#	tests/Unit/Services/Nodes/NodeUpdateServiceTest.php

2018-01-10 20:55:22 -06:00

..

favicons

add favicons for everything

2017-03-18 21:57:12 +01:00

js

Update schedule process to allow toggling/triggering via UI

2018-01-08 21:43:10 -06:00

themes/pterodactyl

Merge branch 'develop' into feature/api-v1

2018-01-10 20:55:22 -06:00

.htaccess

Update to Laravel 5.5 (#814)

2017-12-17 13:07:38 -06:00

index.php

Update to Laravel 5.5 (#814)

2017-12-17 13:07:38 -06:00

robots.txt

Initial Commit of Files

2015-12-06 13:58:49 -05:00