Douwe Maan 8fb49a4b70 Merge branch 'master' into merge-if-green ... # Conflicts: # app/views/projects/merge_requests/widget/_heading.html.haml # app/views/projects/merge_requests/widget/open/_accept.html.haml		2015-12-08 22:34:03 +01:00
..
api	Merge branch 'master' into merge-if-green	2015-12-08 22:34:03 +01:00
ci/api	Fix caching breaking test of build artifacts	2015-11-13 14:43:14 +01:00