summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-03-26 14:30:35 +0100
committerVincent Petry <pvince81@owncloud.com>2014-03-26 14:30:35 +0100
commitb656c68edee995e17f6eb1febe2a1d620564a2c9 (patch)
tree075a3204cfced39772acc21659ca6bb2bf39e6c8 /apps/files_encryption
parent028973cbea865075a32db6228b56b7d3960771d6 (diff)
parente002b7242cb19a0e028d325cd64b57e67dc48108 (diff)
downloadnextcloud-server-b656c68edee995e17f6eb1febe2a1d620564a2c9.tar.gz
nextcloud-server-b656c68edee995e17f6eb1febe2a1d620564a2c9.zip
Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
Fix merging of external storage configurations
Diffstat (limited to 'apps/files_encryption')
0 files changed, 0 insertions, 0 deletions