kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/events/event
History
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
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
 		2015-02-19 20:53:05 -07:00
..
_common.html.haml Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -07:00
_created_project.html.haml Make sure twitter widgets are loaded when rendered through turbolinks. 2015-02-14 13:32:05 +01:00
_note.html.haml Refactor event title generation for more consistent messages. 2015-02-13 12:02:58 +01:00
_push.html.haml Merge branch 'master' into rails-4.1.9 2015-02-19 20:53:05 -07:00