218283b368
# Conflicts: # app/controllers/files_controller.rb # app/controllers/projects/uploads_controller.rb # app/uploaders/attachment_uploader.rb |
||
---|---|---|
.. | ||
_discussion.html.haml | ||
_form.html.haml | ||
_issue.html.haml | ||
_issue_context.html.haml | ||
_issues.html.haml | ||
edit.html.haml | ||
index.atom.builder | ||
index.html.haml | ||
new.html.haml | ||
show.html.haml | ||
update.js.haml |