• Douwe Maan's avatar
    Merge branch 'master' into issue_12658 · ae7b2ef6
    Douwe Maan authored
    # 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
    ae7b2ef6
application_controller.rb 11.5 KB