nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-05 18:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/exifBlacklist' into exifBlacklist

Browse Source 
# Conflicts:
#	public/mix-manifest.json
#	resources/js/helpers.js
#	resources/js/i18n/lang/cn.json
#	resources/js/i18n/lang/en.json
#	resources/js/i18n/lang/sk.json
#	resources/js/store/modules/fileFunctions.js
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Others.vue
This commit is contained in:
Peter Papp
2020-10-24 10:40:59 +02:00
parent a2ec066c6d 755523e07b
commit e5335c2472
Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available