]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption_check_private_key
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 10 Jun 2013 10:12:07 +0000 (12:12 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 10 Jun 2013 10:12:07 +0000 (12:12 +0200)
commit13017ce9e114d84ba9b4ced240e5648447fdfe45
tree5a4ae7b311319a239d9c6792cefc879b5558d1cc
parentb25ab94a08ab9ba5e322043ac470d5352d456c71
parentdb06b906e50d7d1b7eca28f51db913af1fbc81f1
Merge branch 'master' into files_encryption_check_private_key

Conflicts:
settings/ajax/changepassword.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/helper.php
apps/files_encryption/tests/share.php
settings/ajax/changepassword.php