]> 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 18:34:43 +0000 (20:34 +0200)
committerFlorin Peter <github@florin-peter.de>
Fri, 31 May 2013 18:34:43 +0000 (20:34 +0200)
commit8761242f5240319e234c9fa3020141e9791cdcfb
treea0f2e6b080f276826cb54963e484449288587fb8
parent1bfe975938e96f462afe5ef5e5ebc75735767711
parenteafb241068c9d2ca591e37580722101ea548ef88
Merge branch 'master' into files_encryption_upgrade_fix

Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/appinfo/app.php
apps/files_encryption/hooks/hooks.php