From: Björn Schießle Date: Tue, 2 Jul 2013 11:49:49 +0000 (+0200) Subject: Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encrypti... X-Git-Tag: v6.0.0alpha2~524^2~2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=38ed00398f4df27967ae771c54a6a8f6bed07dbd;p=nextcloud-server.git Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version --- 38ed00398f4df27967ae771c54a6a8f6bed07dbd