]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption_upgrade_fix
authorBjörn Schießle <schiessle@owncloud.com>
Wed, 12 Jun 2013 18:53:45 +0000 (20:53 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Wed, 12 Jun 2013 18:53:45 +0000 (20:53 +0200)
commit27fcdb3af5d1b1012695a09e04c0a654a1dde710
tree6de492454c862852de3f51bd8834e2012139b5ac
parent46e5e9bd73a68f7b50bb79f883a8bc6efacaca97
parent3584d48d65900b15dc3ef6831926f4a52e508625
Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
apps/files_encryption/tests/crypt.php
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/util.php