Skip to content
Snippets Groups Projects
Commit 27fcdb3a authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
	apps/files_encryption/tests/crypt.php
parents 46e5e9bd 3584d48d
Branches
No related tags found
Loading
Showing
with 182 additions and 19 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment