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
..
root.go	Merge branch 'develop' of github.com:Pterodactyl/wings into develop	2017-10-01 20:59:32 +02:00