1
0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-05-05 15:55:56 +02:00

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

@@ -97,7 +97,7 @@ export default define({
this.fetching = true;
(this as any).api('drive/files', {
folder_id: this.props.folder,
folderId: this.props.folder,
type: 'image/*',
limit: 100
}).then(images => {