Merge branch 'develop' into 'feature/attachment-form-improvements'

# Conflicts: # src/components/attachment/attachment.js
2016-11-25 21:02:53 -05:00 · 2016-11-25 21:02:53 -05:00 · cb940a8742
commit cb940a8742
parent 01edb7dbe4 1be1d7563c
15 changed files with 219 additions and 112 deletions
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@ -20,4 +20,4 @@ const Attachment = {
  }
 }

-export default Attachment
+export default Attachment