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
..
environment.go	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00
inventory.go	Add sort, order parameter to Get Request of "project/id/inventory"	2017-03-16 23:55:50 +09:00
keys.go	Add sort, order parameter to Get Request of "project/id/key"	2017-03-17 00:18:16 +09:00
project.go	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00
projects.go	merge models -> db	2017-02-22 21:12:16 -08:00
repository.go	Add sort, order parameter to Get Request of "project/id/repositories"	2017-03-17 00:31:34 +09:00
templates.go	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00
users.go	Add sort, order parameter to Get Request of "project/id/users"	2017-03-17 00:41:44 +09:00