]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption_upgrade_fix
authorFlorin Peter <github@florin-peter.de>
Fri, 31 May 2013 10:58:12 +0000 (12:58 +0200)
committerFlorin Peter <github@florin-peter.de>
Fri, 31 May 2013 10:58:12 +0000 (12:58 +0200)
commit1bfe975938e96f462afe5ef5e5ebc75735767711
tree041bb3fe5f9cbd8ccff3fcacd2d629287b7d0410
parent96ef926161155cf710838612501bf76756f89cb4
parentd636e168a6c043ddae730f7cdaaee772b1067793
Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
apps/files_encryption/lib/util.php
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/util.php