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
..
migrations	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00
AccessKey.go	merge models -> db	2017-02-22 21:12:16 -08:00
APIToken.go	merge models -> db	2017-02-22 21:12:16 -08:00
Environment.go	merge models -> db	2017-02-22 21:12:16 -08:00
Event.go	Merge branch 'master' into develop	2017-03-06 11:34:10 -08:00
Inventory.go	merge models -> db	2017-02-22 21:12:16 -08:00
migrations.go	refactoring	2016-05-24 10:55:48 +01:00
models.go	merge models -> db	2017-02-22 21:12:16 -08:00
mysql.go	refactoring	2016-05-24 10:55:48 +01:00
Project.go	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00
Repository.go	merge models -> db	2017-02-22 21:12:16 -08:00
Session.go	merge models -> db	2017-02-22 21:12:16 -08:00
Task.go	merge models -> db	2017-02-22 21:12:16 -08:00
Template.go	merge models -> db	2017-02-22 21:12:16 -08:00
User.go	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00
versionHistory.go	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00