Skip to content
  • Vinnie Okada's avatar
    Merge branch 'master' into rails-4.1.9 · 6374957cc691
    Vinnie Okada authored
    Conflicts:
    	app/views/dashboard/_project.html.haml
    	app/views/events/event/_common.html.haml
    	app/views/explore/projects/_project.html.haml
    	app/views/groups/_projects.html.haml
    	app/views/projects/_home_panel.html.haml
    	app/views/projects/_issues_nav.html.haml
    	app/views/projects/issues/_discussion.html.haml
    	app/views/projects/issues/_issues.html.haml
    	app/views/projects/issues/show.html.haml
    	app/views/projects/merge_requests/_discussion.html.haml
    	app/views/projects/merge_requests/_show.html.haml
    	app/views/projects/milestones/index.html.haml
    	app/views/projects/notes/_edit_form.html.haml
    	app/views/shared/_issuable_filter.html.haml
    6374957cc691