]> source.dussan.org Git - nextcloud-server.git/commit
Merge remote-tracking branch 'origin/master'
authorjknockaert <jasper@knockaert.nl>
Thu, 19 Feb 2015 15:08:33 +0000 (16:08 +0100)
committerjknockaert <jasper@knockaert.nl>
Thu, 19 Feb 2015 15:08:33 +0000 (16:08 +0100)
commit417e40d218037cd6f930a8dbacfe951eb9499e82
tree394c9cb4e219a89729f05ea193e8d38a5fd8d0d6
parentd5ba6af25905797e0f38bccdb40cc012b3b7d3d6
parent470994ba1eb89edf461f93726d51047fcf9665b6
Merge remote-tracking branch 'origin/master'

Conflicts:
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/stream.php