Jakob Schrettenbrunner 44f42eec8c Merge branch 'develop' of github.com:Pterodactyl/wings into develop ...

# Conflicts:
#	api/api.go
#	api/core_routes.go
#	api/handlers_server.go
#	api/routes_server.go
#	config.example.json
#	utils/logging.go

2017-10-01 20:59:32 +02:00

..

_testdata

Change to using yml for configuration files

2017-09-30 17:25:04 -05:00

api.go

Merge branch 'develop' of github.com:Pterodactyl/wings into develop

2017-10-01 20:59:32 +02:00

auth_test.go

Change to using yml for configuration files

2017-09-30 17:25:04 -05:00

auth.go

current state of api & docker env implementation

2017-10-01 20:42:17 +02:00

handlers_server_test.go

current state of api & docker env implementation

2017-10-01 20:42:17 +02:00

handlers_server.go

current state of api & docker env implementation

2017-10-01 20:42:17 +02:00

handlers_test.go

api: better routes

2017-08-02 23:23:41 +02:00

handlers.go

Merge branch 'develop' of github.com:Pterodactyl/wings into develop

2017-10-01 20:59:32 +02:00

routes.go

Merge branch 'develop' of github.com:Pterodactyl/wings into develop

2017-10-01 20:59:32 +02:00

utils.go

current state of api & docker env implementation

2017-10-01 20:42:17 +02:00