]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption_check_private_key
authorBjörn Schießle <schiessle@owncloud.com>
Tue, 11 Jun 2013 13:19:02 +0000 (15:19 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Tue, 11 Jun 2013 13:19:02 +0000 (15:19 +0200)
commit20ddd6e1c77224d18d5be74101b80144b7187475
tree1320acdc30a977f9294dc0ae2f6c36667982da31
parent64593e4b84fdd6881a43530461c50464303cc42e
parentdb6080c5c682a2bbdc420399276b81311c17802c
Merge branch 'master' into files_encryption_check_private_key

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