]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption_check_private_key
authorBjörn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 11:17:35 +0000 (13:17 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Thu, 13 Jun 2013 11:17:35 +0000 (13:17 +0200)
commit7cfb0dc406910f66eaefc8651fd655a78883f241
treea8cda865f793d21f8248c5035c363ee3971fdd1a
parent20ddd6e1c77224d18d5be74101b80144b7187475
parentdd8011925acbd701de10e604b377c3d7f01aeff8
Merge branch 'master' into files_encryption_check_private_key

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