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

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

Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version
parents 40e6ede6 3b1018ec
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