diff options
| author | dave <starpumadev@gmail.com> | 2019-03-25 14:47:54 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-25 14:47:54 -0400 |
| commit | 6143b1ce0febe0451305918d1c735c4c23071701 (patch) | |
| tree | 4be42874c05043599caf80894808842c674791f1 /src/components/media_upload/media_upload.js | |
| parent | 6a9159b25598d578018643673568bbcd06ea1e12 (diff) | |
| parent | 854d0e80512d2da80cd5153144698a5148da4aa6 (diff) | |
Resolve merge conflict,
Fix few issues (conversation page highlight, fetch conversation, ...)
Diffstat (limited to 'src/components/media_upload/media_upload.js')
| -rw-r--r-- | src/components/media_upload/media_upload.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js index 1c874faa..e4b3d460 100644 --- a/src/components/media_upload/media_upload.js +++ b/src/components/media_upload/media_upload.js @@ -20,7 +20,7 @@ const mediaUpload = { return } const formData = new FormData() - formData.append('media', file) + formData.append('file', file) self.$emit('uploading') self.uploading = true |