[Pkg-owncloud-commits] [owncloud] 03/05: Merge tag 'upstream/7.0.13__rc2_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 9c7551b48674917755d0794e31454381df481d78
Merge: 678b98e eb5e3b8
Author: David Prévot <taffit at debian.org>
Date:   Sat Mar 5 11:40:57 2016 -0400

    Merge tag 'upstream/7.0.13__rc2_dfsg'
    
    Upstream version 7.0.13~~rc2~dfsg
    
    # gpg: Signature faite le sam. 05 mars 2016 11:40:50 AST
    # gpg:                avec la clef RSA 058C1CF944F6BD3C
    # gpg: Bonne signature de « David Prévot <david at tilapin.org> » [inconnu]
    # gpg:                 alias « David Prévot <davidp at altern.org> » [inconnu]
    # gpg:                 alias « David Prévot <davidp at no-log.org> » [inconnu]
    # gpg:                 alias « David Prévot <taffit at debian.org> » [inconnu]
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : AE14 AD01 426D 2BFB 82EF  7E1E B82A 217A FDFE 09F2
    #    Empreinte de la sous-clef : 7875 4D07 BC09 5C74 48F7  8D66 058C 1CF9 44F6 BD3C

 3rdparty/doctrine/dbal/lib/Doctrine/DBAL/README.markdown            | 0
 apps/files_texteditor/js/vendor/ace/src-noconflict/mode-text.js     | 0
 .../_sources/configuration/external_storage_configuration.txt       | 2 +-
 .../_sources/configuration/serving_static_files_configuration.txt   | 4 ++--
 .../doc/admin/release/_sources/installation/nginx_configuration.txt | 2 +-
 .../doc/admin/release/_sources/installation/source_installation.txt | 6 +++---
 core/doc/admin/release/_sources/installation/yaws_configuration.txt | 2 +-
 .../admin/release/configuration/external_storage_configuration.html | 2 +-
 .../release/configuration/serving_static_files_configuration.html   | 4 ++--
 core/doc/admin/release/installation/source_installation.html        | 6 +++---
 core/doc/admin/release/installation/yaws_configuration.html         | 2 +-
 core/doc/user/_sources/pim/contacts.txt                             | 2 +-
 core/doc/user/_sources/pim/troubleshooting.txt                      | 3 ++-
 version.php                                                         | 6 +++---
 14 files changed, 21 insertions(+), 20 deletions(-)

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