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

Browse Source

# Conflicts:
#	.env.example
#	package-lock.json
#	package.json
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/App.vue
#	resources/js/helpers.js
#	resources/js/i18n/lang/en.json
#	resources/js/i18n/lang/sk.json
#	resources/js/store/modules/fileFunctions.js
#	resources/js/views/Shared/SharedPage.vue

...

This commit is contained in:

Peter Papp

2020-08-28 16:14:28 +02:00

parent 82b43eb996 0d5df91d2d

commit be08c8487a

181 changed files with 9905 additions and 149203 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

1526

resources/js/i18n/lang/sk.json

File diff suppressed because it is too large Load Diff