Skip to content
Commit 8761242f authored by Florin Peter's avatar Florin Peter
Browse files

Merge branch 'master' into files_encryption_upgrade_fix 

Conflicts:
	apps/files_encryption/appinfo/app.php
parents 1bfe9759 eafb2410
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment