9e9ce95d62
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 |
||
---|---|---|
.. | ||
_activities.html.haml | ||
_groups.html.haml | ||
_project.html.haml | ||
_projects.html.haml | ||
_projects_filter.html.haml | ||
_sidebar.html.haml | ||
_zero_authorized_projects.html.haml | ||
issues.atom.builder | ||
issues.html.haml | ||
merge_requests.html.haml | ||
projects.html.haml | ||
show.atom.builder | ||
show.html.haml |