• Vinnie Okada's avatar
    Merge branch 'master' into rails-4.1.9 · 2a9eed66
    Vinnie Okada authored
    Conflicts:
    	app/views/projects/commits/_commit.html.haml
    	app/views/projects/issues/_issue.html.haml
    	app/views/projects/issues/_issue_context.html.haml
    	app/views/projects/merge_requests/_merge_request.html.haml
    	app/views/projects/merge_requests/show/_context.html.haml
    2a9eed66
_discussion.html.haml 1.53 KB