]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'master' into file_encryption_external_storage_fixes
authorFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 17:19:40 +0000 (19:19 +0200)
committerFlorin Peter <github@florin-peter.de>
Wed, 29 May 2013 17:19:40 +0000 (19:19 +0200)
1  2 
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/util.php

Simple merge
Simple merge