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	update contributing.md	2017-02-22 03:51:23 -08:00
inventory	update add templates, gh release script	2017-02-22 13:29:49 -08:00
keys	Added SSH certificate support	2017-02-23 11:21:18 +00:00
repositories	update contributing.md	2017-02-22 03:51:23 -08:00
templates	Add copy button at Task Templates page	2017-03-12 21:10:34 +09:00
users	update contributing.md	2017-02-22 03:51:23 -08:00
add.pug	update contributing.md	2017-02-22 03:51:23 -08:00
container.pug	Add page title to class at ui-view	2017-03-14 19:01:25 +09:00
createTaskModal.pug	update contributing.md	2017-02-22 03:51:23 -08:00
dashboard.pug	Merge branch 'master' of github.com:ansible-semaphore/semaphore	2017-02-22 03:51:31 -08:00
edit.pug	made changes from review	2017-03-13 12:30:48 +10:00
schedule.pug	update contributing.md	2017-02-22 03:51:23 -08:00
taskModal.pug	update contributing.md	2017-02-22 03:51:23 -08:00