]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption-style-fixes
authorSam Tuke <samtuke@owncloud.com>
Sat, 9 Feb 2013 11:52:11 +0000 (11:52 +0000)
committerSam Tuke <samtuke@owncloud.com>
Sat, 9 Feb 2013 11:52:11 +0000 (11:52 +0000)
commitb95bc663af4135eff12a6a0c97afe37859f35094
tree3ebb198e5f10ae34b9478b925e4a58d0be3c4aea
parentd2b288ca704af4d74d1fa13e44966b1c34cf56bd
parentab4ae2b952fedf7bac2810bb6be7997fb661a1fc
Merge branch 'master' into files_encryption-style-fixes

Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php
apps/files_encryption/lib/crypt.php