624abdfc72
Conflicts: app/decorators/event_decorator.rb |
||
---|---|---|
.. | ||
_groups.html.haml | ||
_projects.html.haml | ||
index.atom.builder | ||
index.html.haml | ||
index.js.haml | ||
issues.atom.builder | ||
issues.html.haml | ||
merge_requests.html.haml |
624abdfc72
Conflicts: app/decorators/event_decorator.rb |
||
---|---|---|
.. | ||
_groups.html.haml | ||
_projects.html.haml | ||
index.atom.builder | ||
index.html.haml | ||
index.js.haml | ||
issues.atom.builder | ||
issues.html.haml | ||
merge_requests.html.haml |