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
..
bindata.go	add alert setting for user and (WIP) project	2017-03-10 10:12:55 +10:00
config.go	make ldap searched parameters configurable	2017-04-04 22:27:06 +10:00
mail.go	made changes from review	2017-03-13 12:30:48 +10:00
upgrade.go	fix api breaking of google/go-github	2017-02-21 20:44:35 +01:00
util_test.go	begin refactor gin -> net/http	2017-02-22 14:17:36 -08:00
util.go	🎉 gin -> net/http	2017-02-22 15:21:49 -08:00
version.go	begin refactor gin -> net/http	2017-02-22 14:17:36 -08:00