diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-03-31 13:12:04 +0200 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-03-31 13:12:04 +0200 |
commit | 2be2a5d2c5d8cbc671c4f301eb337fee20023538 (patch) | |
tree | 4b6870b52f5606883d239485f6e971b77bdbb956 /COPYING-README | |
parent | 6ac85480f7bffeb65fcbc5820ea7bd4ecd8f21ad (diff) | |
parent | 65e3f634000a2142f412b85d0443f241bb64a9ab (diff) | |
download | nextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.tar.gz nextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.zip |
external storage: fix merge conflict, indentation
Diffstat (limited to 'COPYING-README')
0 files changed, 0 insertions, 0 deletions