Commit Graph

7 Commits

Author SHA1 Message Date
Jakob Schrettenbrunner
09da18f42e Merge branch 'develop' into feature/docker-environment
# Conflicts:
#	.dev/vagrant/provision.sh
#	Gopkg.lock
#	Gopkg.toml
#	Vagrantfile
#	api/api.go
#	api/auth.go
#	api/handlers.go
#	api/handlers_server.go
#	api/routes.go
#	api/utils.go
#	command/root.go
#	control/docker_environment.go
#	control/server.go
#	glide.lock
#	glide.yaml
#	utils/logger.go
#	wings.go
2018-05-16 10:00:07 +02:00
Jakob Schrettenbrunner
501409827e some reorganisation etc. in control package
some minor stuff
just pushing so I can try to replace fsouza/go-dockerclient with moby/moby/client
2018-02-20 23:38:29 +01:00
Jakob Schrettenbrunner
e4e060a82f rename to new lowercase github namespace 2018-02-20 21:25:31 +01:00
Dane Everitt
bacdfae768
Probably breaks everything, lowercase pterodactyl 2018-02-20 13:33:32 -06:00
Jakob Schrettenbrunner
72ac95267b fix some merge fails 2017-10-09 21:01:24 +02:00
Jakob Schrettenbrunner
c979285eb9 current state of api & docker env implementation 2017-10-01 20:42:17 +02:00
Jakob Schrettenbrunner
c1054c482f rename tools package to utils 2017-09-24 19:47:40 +02:00