Semaphore/db
Matej Kramny 6c633fdbf2 Merge branch 'master' into develop
# Conflicts:
#	api/auth.go
#	cli/main.go
#	db/Event.go
2017-03-06 11:34:10 -08:00
..
migrations fix migration file 2016-11-21 17:18:44 -08: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 models -> db 2017-02-22 21:12:16 -08: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 models -> db 2017-02-22 21:12:16 -08:00
versionHistory.go fix migration file 2016-11-21 17:18:44 -08:00