Skip to content
Commit fd5042cc authored by Björn Schießle's avatar Björn Schießle
Browse files

Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into... 

Merge branch 'files_encryption_upgrade_fix' of github.com:owncloud/core into files_encryption_upgrade_fix
parents 2f1005f0 2daec351
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