Skip to content
Commit 4441835d authored by Thomas Müller's avatar Thomas Müller
Browse files

https://github.com/owncloud/core/pull/15305#discussion_r27382305 

Conflicts:
	lib/private/files/stream/encryption.php
parent 90487384
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment