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

..

js

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

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

lang

reading metadata in shared link RC

2020-08-25 12:36:21 +02:00

sass

Shared link expiration backend

2020-08-26 07:29:28 +02:00

views

shared link title fix

2020-08-25 15:33:16 +02:00

babel.babel

v1.7 beta.ť

2020-07-17 08:39:01 +02:00