Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
src/server/web/app/common/views/widgets/slideshow.vue
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 => {