[Pkg-owncloud-commits] [owncloud] 15/16: Merge tag 'upstream/7.0.11__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 f4f00b9e3fdd07038621a63adb13f6d2ae90cda3
Merge: 68828ee 80574dc
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 22 11:13:28 2015 -0400

    Merge tag 'upstream/7.0.11__rc1_dfsg'
    
    Upstream version 7.0.11~~rc1~dfsg
    
    # gpg: Signature made jeu. 22 oct. 2015 11:12:52 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/user_ldap/lib/user/user.php                   |  8 +-
 core/ajax/update.php                               |  6 ++
 core/command/upgrade.php                           |  6 ++
 .../big_file_upload_configuration.txt              |  2 +-
 .../configuration/config_sample_php_parameters.txt | 13 ++-
 .../_sources/configuration/user_configuration.txt  |  3 +-
 .../_sources/installation/installation_wizard.txt  |  7 +-
 .../_sources/installation/nginx_configuration.txt  | 93 ++++++++++++++-------
 .../_sources/installation/source_installation.txt  | 96 ++++++++++++++++++---
 core/doc/admin/release/_sources/issues/index.txt   |  6 ++
 .../big_file_upload_configuration.html             |  2 +-
 .../config_sample_php_parameters.html              | 17 ++--
 .../release/configuration/user_configuration.html  |  2 +-
 core/doc/admin/release/contents.html               |  7 +-
 core/doc/admin/release/installation/index.html     |  7 +-
 .../release/installation/installation_wizard.html  |  7 +-
 .../release/installation/nginx_configuration.html  | 97 ++++++++++++++--------
 .../release/installation/source_installation.html  | 86 ++++++++++++++++---
 core/doc/admin/release/issues/index.html           |  6 ++
 core/doc/admin/release/objects.inv                 |  4 +-
 core/doc/user/_sources/files/files.txt             | 62 ++++++++++++++
 core/doc/user/contents.html                        |  1 +
 core/doc/user/files/files.html                     | 52 ++++++++++++
 core/js/js.js                                      |  2 +-
 core/js/tests/specs/coreSpec.js                    |  2 +
 lib/private/connector/sabre/objecttree.php         |  3 +
 lib/private/memcache/memcached.php                 |  5 ++
 lib/private/updater.php                            | 16 ++++
 version.php                                        |  8 +-
 29 files changed, 512 insertions(+), 114 deletions(-)

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