]> source.dussan.org Git - nextcloud-server.git/commit
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)
commit3fc5b34247cc30809ca525b96e73f1448e5b2e9b
treee92a0b479329a3f386452396b595a38cac61e4b4
parent38ed00398f4df27967ae771c54a6a8f6bed07dbd
parent29dd7eda2de629024548ddef419f1d6991ae07a6
Merge branch 'master' into encryption_check_php_version

Conflicts:
apps/files_encryption/files/error.php
apps/files_encryption/files/error.php