[Pkg-owncloud-commits] [owncloud] 40/70: Merge pull request #9109 from owncloud/stable6-extstorage-multiplemountpointconfig

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v6.0.5RC1
in repository owncloud.

commit 3a27cc5221f54c85c0d157eba17c0ffca6784bce
Merge: a47aad8 26ded10
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Tue Jul 22 15:28:00 2014 +0200

    Merge pull request #9109 from owncloud/stable6-extstorage-multiplemountpointconfig
    
    [6.0.5] Fix merging of external storage configurations

 apps/files_external/lib/config.php         |  78 +++++++----
 apps/files_external/templates/settings.php |  14 +-
 apps/files_external/tests/mountconfig.php  | 201 ++++++++++++++++++++++++++---
 3 files changed, 242 insertions(+), 51 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git