Resolve conflicts

This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions

View file

@ -53,7 +53,7 @@ export default Vue.extend({
data.append('i', (this as any).os.i.account.token);
data.append('file', file);
if (folder) data.append('folder_id', folder);
if (folder) data.append('folderId', folder);
const xhr = new XMLHttpRequest();
xhr.open('POST', apiUrl + '/drive/files/create', true);