]> source.dussan.org Git - nextcloud-server.git/commit
Merge branch 'master' into files_encryption
authorFlorin Peter <github@florin-peter.de>
Tue, 21 May 2013 23:22:36 +0000 (01:22 +0200)
committerFlorin Peter <github@florin-peter.de>
Tue, 21 May 2013 23:26:35 +0000 (01:26 +0200)
commit28d72b822deadd9d4e510eefd3a0f76ebdf236ec
treec1bf37663599006776656e618475370a3578c3b1
parentafbfa742d7848089523262f5c234035db1b20d3b
parente2444ec9c5a7c36f7cfaa200387fb8d16e5dedb1
Merge branch 'master' into files_encryption

Conflicts:
lib/files/cache/cache.php
db_structure.xml
lib/files/cache/cache.php
lib/files/view.php