]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Wed, 22 May 2013 13:29:22 +0000 (15:29 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Wed, 22 May 2013 13:29:22 +0000 (15:29 +0200)
commitee53bd1aa3e3cb62a93dfda66141e3537426d5dd
tree376c87af2bb2629cb1c38098517bec8590bf6107
parentc6722581f982d05909664171bd66cc7ec2a2a67b
parent26732ecaa63f054f76e34b276668310f344ee50b
Merge branch 'master' into files_encryption

Conflicts:
lib/files/cache/cache.php
lib/files/cache/cache.php
lib/user.php