# Conflicts: # app/models/attachment.rb # app/views/api/v1/attachments/_simple_detail.json.jbuilder |
||
---|---|---|
.. | ||
_detail.json.jbuilder | ||
_simple_detail.json.jbuilder |
# Conflicts: # app/models/attachment.rb # app/views/api/v1/attachments/_simple_detail.json.jbuilder |
||
---|---|---|
.. | ||
_detail.json.jbuilder | ||
_simple_detail.json.jbuilder |