4 Commits

Author	SHA1	Message	Date
Matej Kramny	0b276d137c	set hostnaem	2017-04-19 21:25:03 +01:00
Matej Kramny	e22e3c167d	fix docker answer file	2017-04-19 20:53:59 +01:00
Matej Kramny	db4948cb89	Merge branch 'master' into develop ... # Conflicts: # Dockerfile # api/login.go # api/projects/environment.go # api/projects/project.go # api/projects/templates.go # api/tasks/runner.go # api/users.go # db/versionHistory.go # util/bindata.go	2017-04-18 14:48:31 +01:00
Matej Kramny	2a2b7e8aed	merge models -> db	2017-02-22 21:12:16 -08:00