[Pkg-owncloud-commits] [owncloud] 09/11: Merge tag 'upstream/7.0.10_dfsg'

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 1b9bd59423bc9b70003470ac6c3453e2d6ca4b92
Merge: 4dcf53b 0d4d217
Author: David Prévot <taffit at debian.org>
Date:   Sat Sep 12 11:23:36 2015 -0400

    Merge tag 'upstream/7.0.10_dfsg'
    
    Upstream version 7.0.10~dfsg
    
    # gpg: Signature made sam. 12 sept. 2015 11:22:12 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

 apps/files_sharing/tests/updater.php                      |  8 ++++----
 .../configuration/external_storage_configuration_gui.txt  | 15 ---------------
 .../configuration/external_storage_configuration_gui.html | 13 -------------
 core/doc/user/_sources/pim/contacts.txt                   |  2 +-
 core/doc/user/pim/contacts.html                           |  2 +-
 lib/private/app.php                                       |  2 +-
 lib/private/updater.php                                   |  8 --------
 version.php                                               |  6 +++---
 8 files changed, 10 insertions(+), 46 deletions(-)

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