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
..
root.go	Merge branch 'develop' into feature/docker-environment	2018-05-16 10:00:07 +02:00