]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into encryption_check_php_version
authorBjörn Schießle <schiessle@owncloud.com>
Tue, 2 Jul 2013 11:54:31 +0000 (13:54 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Tue, 2 Jul 2013 11:54:31 +0000 (13:54 +0200)
Conflicts:
apps/files_encryption/files/error.php

1  2 
apps/files_encryption/files/error.php

Simple merge