[Pkg-owncloud-commits] [owncloud] 09/11: Merge tag 'upstream/7.0.7__rc1_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 40dabd0dd8b1f095b6191bedd320c150debabe57
Merge: 5635b7b a7e20de
Author: David Prévot <taffit at debian.org>
Date:   Thu Jul 2 11:12:45 2015 -0400

    Merge tag 'upstream/7.0.7__rc1_dfsg'
    
    Upstream version 7.0.7~~rc1~dfsg
    
    # gpg: Signature made jeu. 02 juil. 2015 11:12:39 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/preupdate.php                | 23 ++++++++++++++
 apps/activity/lib/parameterhelper.php              |  2 +-
 apps/activity/tests/parameterhelpertest.php        | 37 ++++++++++++++++++++++
 apps/contacts/lib/addressbookprovider.php          |  4 ++-
 apps/files_sharing/lib/cache.php                   |  8 ++++-
 config/config.sample.php                           |  2 +-
 .../configuration/config_sample_php_parameters.txt |  2 +-
 .../_sources/installation/installation_wizard.txt  | 29 ++++++++---------
 .../config_sample_php_parameters.html              |  2 +-
 .../release/installation/installation_wizard.html  | 27 ++++++++--------
 lib/private/app.php                                | 10 +++---
 lib/private/installer.php                          |  6 ++--
 lib/private/ocsclient.php                          | 18 ++++++++---
 settings/ajax/apps/ocs.php                         |  4 +--
 version.php                                        |  6 ++--
 15 files changed, 127 insertions(+), 53 deletions(-)

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