]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into encryption_improved_error_messages_4617
authorBjoern Schiessle <schiessle@owncloud.com>
Mon, 23 Sep 2013 08:39:12 +0000 (10:39 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Mon, 23 Sep 2013 08:39:12 +0000 (10:39 +0200)
commitf6e8a388a90fff82c16589cf09911ef3aeb4005d
treea47f16ed41fa3b884a4d709ef09136a4d0c785d0
parent82cbbb8ab8cfe81559c45905d7fca819d71df346
parent9851f0f4f2a97dc6ac1382bcd533eb23feffa4e0
Merge branch 'master' into encryption_improved_error_messages_4617

Conflicts:
settings/ajax/changepassword.php
apps/files/index.php
apps/files/js/files.js
apps/files_encryption/appinfo/app.php
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/util.php