diff options
| author | dave <starpumadev@gmail.com> | 2019-03-26 10:52:46 -0400 |
|---|---|---|
| committer | dave <starpumadev@gmail.com> | 2019-03-26 10:52:46 -0400 |
| commit | 5fd589d5e717bbcbc46db5efb35878b993b6dfbc (patch) | |
| tree | 86691b1fa39bbd909307cd4f5eca368bde375661 /src/components/media_upload/media_upload.js | |
| parent | 13e727b5eebb60330bc87c7ccc70109683c5b963 (diff) | |
| parent | 2f1e69047882a1fc36f87dc1fff752bc76e61fa4 (diff) | |
merge develop & resolve conflict
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 |