]> source.dussan.org Git - nextcloud-server.git/commit
external storage: fix merge conflict, indentation
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Mon, 31 Mar 2014 11:12:04 +0000 (13:12 +0200)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Mon, 31 Mar 2014 11:12:04 +0000 (13:12 +0200)
commit2be2a5d2c5d8cbc671c4f301eb337fee20023538
tree4b6870b52f5606883d239485f6e971b77bdbb956
parent6ac85480f7bffeb65fcbc5820ea7bd4ecd8f21ad
parent65e3f634000a2142f412b85d0443f241bb64a9ab
external storage: fix merge conflict, indentation
apps/files_external/templates/settings.php
core/css/styles.css