Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 ... # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb		2016-03-21 23:22:21 +01:00
..
api	Merge branch 'master' into issue_12658	2016-03-21 23:22:21 +01:00
ci/api	Fix ci_build trace trait	2016-02-19 19:31:57 +01:00