Merge branch 'develop' into feature/docker-environment

Browse Source

# 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

...

This commit is contained in:

Jakob Schrettenbrunner

2018-05-16 10:00:07 +02:00

parent 1ce617c9a4 bbc6d26b35

commit 09da18f42e

11 changed files with 261 additions and 170 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

wings-api.paw

Binary file not shown.