Vinnie Okada 2a9eed6620 Merge branch 'master' into rails-4.1.9 ... 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		2015-02-21 12:55:28 -07:00
..
_commit.html.haml	Merge branch 'master' into rails-4.1.9	2015-02-21 12:55:28 -07:00
_commit_list.html.haml	Factor out commit list from compare and new MR.	2014-09-14 10:15:14 +02:00
_commits.html.haml	Improve commits UI	2015-02-19 18:23:10 -08:00
_head.html.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
_inline_commit.html.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
show.atom.builder	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00
show.html.haml	Upgrade to Rails 4.1.9	2015-02-14 11:09:23 -07:00