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
..
auth	update contributing.md	2017-02-22 03:51:23 -08:00
projects	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00
users	make username and password fields read-only for ldap users	2017-03-27 15:37:55 +10:00
.gitignore	Auth page	2016-03-18 22:03:28 +00:00
abstract.pug	update contributing.md	2017-02-22 03:51:23 -08:00
admin.pug	update contributing.md	2017-02-22 03:51:23 -08:00
dashboard.pug	update contributing.md	2017-02-22 03:51:23 -08:00
index.pug	merge models -> db	2017-02-22 21:12:16 -08:00
tasks.pug	update contributing.md	2017-02-22 03:51:23 -08:00