Merge remote-tracking branch 'origin/master' into oasis

Browse Source

# Conflicts:
#	public/mix-manifest.json
#	resources/js/components/FilesView/Option.vue
#	resources/js/components/Others/MobileNavigation.vue

...

This commit is contained in:

Peter Papp

2021-05-11 10:37:31 +02:00

parent a6db642db7 6e330046b3

commit a7a6ef9f0a

13 changed files with 169 additions and 206 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

public/chunks/files~chunks/platform~chunks/shared~chunks/shared/file-browser.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long

public/chunks/files~chunks/shared/file-browser.js

Vendored

+1 -1

File diff suppressed because one or more lines are too long