]> source.dussan.org Git - nextcloud-server.git/commit
https://github.com/owncloud/core/pull/15305#discussion_r27382305
authorThomas Müller <thomas.mueller@tmit.eu>
Mon, 30 Mar 2015 11:36:56 +0000 (13:36 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 7 Apr 2015 11:30:28 +0000 (13:30 +0200)
commit4441835d189d037a021ba9a11fd96cf55ba2db3f
treebe55362cd2100abe8cd6ae6ac5b3b674f4fe4a36
parent90487384f77d916ab2dbe495b46bdf5182fb875a
https://github.com/owncloud/core/pull/15305#discussion_r27382305

Conflicts:
lib/private/files/stream/encryption.php
lib/private/files/stream/encryption.php