[Pkg-owncloud-commits] [owncloud] 10/13: Merge tag 'upstream/7.0.7_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 4d7736ca9362fdf3c79e41ad185d0f3ef3e008e3
Merge: b3f844c 6c1e844
Author: David Prévot <taffit at debian.org>
Date:   Fri Jul 3 16:26:54 2015 -0400

    Merge tag 'upstream/7.0.7_dfsg'
    
    Upstream version 7.0.7~dfsg
    
    # gpg: Signature made ven. 03 juil. 2015 16:26:50 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/activity/appinfo/info.xml            |  1 -
 apps/activity/appinfo/version             |  2 +-
 apps/files_encryption/appinfo/info.xml    |  1 -
 apps/files_encryption/appinfo/version     |  2 +-
 apps/files_external/appinfo/info.xml      |  1 -
 apps/files_sharing/appinfo/version        |  2 +-
 apps/files_trashbin/appinfo/info.xml      |  1 -
 apps/files_trashbin/appinfo/preupdate.php | 21 +++++++++++++++++++++
 apps/files_trashbin/appinfo/version       |  2 +-
 apps/files_versions/appinfo/info.xml      |  1 -
 apps/files_versions/appinfo/version       |  2 +-
 apps/gallery/appinfo/info.xml             |  1 -
 apps/gallery/appinfo/version              |  2 +-
 apps/updater/appinfo/info.xml             |  1 -
 apps/updater/appinfo/version              |  2 +-
 apps/user_ldap/appinfo/info.xml           |  1 -
 apps/user_ldap/appinfo/version            |  2 +-
 apps/user_webdavauth/appinfo/info.xml     |  1 -
 apps/user_webdavauth/appinfo/version      |  2 +-
 lib/private/app.php                       |  2 ++
 version.php                               |  8 ++++----
 21 files changed, 36 insertions(+), 22 deletions(-)

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