Peter Papp be08c8487a Merge remote-tracking branch 'origin/master' into filepreview ...

# 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

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

..

lang

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

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

index.js

bugfixes

2020-07-14 10:34:42 +02:00