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
..
projects	Merge branch 'master' into develop	2017-04-18 14:48:31 +01:00
admin.js	Upgrade from the UI	2016-05-17 16:18:26 +01:00
dashboard.js	Improve project creation UI	2016-04-17 01:24:32 +01:00
login.js	Rimraf legacy stuff	2016-04-10 19:45:27 +01:00
tasks.js	Rimraf legacy stuff	2016-04-10 19:45:27 +01:00
user.js	Improve setup, upgrade, new API	2016-05-23 20:29:38 +01:00
users.js	Fix new user modal	2016-06-13 15:40:39 -07:00