[Pkg-owncloud-commits] [owncloud] 15/18: Merge tag 'upstream/8.1.3_dfsg' into stable8

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 3cfb6d92586d8ec1355f5a126a077d80d6da3ee3
Merge: 97c11e6 adecb3d
Author: David Prévot <taffit at debian.org>
Date:   Wed Sep 16 09:45:30 2015 -0400

    Merge tag 'upstream/8.1.3_dfsg' into stable8
    
    Upstream version 8.1.3~dfsg
    
    # gpg: Signature made mer. 16 sept. 2015 09:39:06 AST
    # gpg:                using RSA key 058C1CF944F6BD3C
    # gpg: Good signature from "David Prévot <david at tilapin.org>"
    # gpg:                 aka "David Prévot <davidp at altern.org>"
    # gpg:                 aka "David Prévot <davidp at no-log.org>"
    # gpg:                 aka "David Prévot <taffit at debian.org>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #      Subkey fingerprint: 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 .htaccess                                          |   2 +-
 apps/files_sharing/lib/mountprovider.php           |   6 --
 .../lib/propagation/recipientpropagator.php        |   8 ++
 apps/files_sharing/lib/sharedmount.php             |  16 ++-
 apps/files_sharing/lib/sharedstorage.php           |   7 +-
 .../external_storage_configuration_gui.txt         |  15 ---
 .../external_storage_configuration_gui.html        |  13 ---
 core/doc/user/_sources/pim/contacts.txt            |   2 +-
 core/doc/user/pim/contacts.html                    |   2 +-
 lib/base.php                                       |   1 +
 lib/private/app.php                                |   2 +-
 lib/private/share/hooks.php                        | 115 ++++++++++++++++-----
 lib/private/share/share.php                        |   2 +
 version.php                                        |   6 +-
 14 files changed, 122 insertions(+), 75 deletions(-)

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