[Pkg-owncloud-commits] [owncloud] 09/12: Merge tag 'upstream/7.0.4+dfsg'
David Prévot
taffit at moszumanska.debian.org
Tue Dec 9 22:47:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit 2d69433eca193c331a7070d1b744e0dc113f24a9
Merge: b25eda1 d476825
Author: David Prévot <taffit at debian.org>
Date: Mon Dec 8 21:42:45 2014 -0400
Merge tag 'upstream/7.0.4+dfsg'
Upstream version 7.0.4+dfsg
# gpg: Signature faite le lun. 08 déc. 2014 21:42:14 AST
# gpg: avec la clef RSA 058C1CF944F6BD3C
# gpg: Bonne signature de « David Prévot <david at tilapin.org> »
# gpg: alias « David Prévot <davidp at altern.org> »
# gpg: alias « David Prévot <davidp at no-log.org> »
# gpg: alias « David Prévot <taffit at debian.org> »
# 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
apps/activity/l10n/fr.php | 6 +-
apps/bookmarks/l10n/fr.php | 2 +-
apps/calendar/l10n/fr.php | 28 ++++-----
apps/firstrunwizard/l10n/fr.php | 6 +-
apps/user_ldap/lib/access.php | 10 +++-
apps/user_ldap/user_ldap.php | 2 +-
.../configuration/config_sample_php_parameters.txt | 66 ++-------------------
.../configuration/database_configuration.txt | 2 +-
.../configuration/antivirus_configuration.html | 6 +-
.../configuration/automatic_configuration.html | 6 +-
.../background_jobs_configuration.html | 6 +-
.../big_file_upload_configuration.html | 6 +-
.../collaborative_documents_configuration.html | 6 +-
.../config_sample_php_parameters.html | 52 +++-------------
.../configuration/custom_client_configuration.html | 6 +-
.../configuration/database_configuration.html | 8 +--
.../admin/configuration/email_configuration.html | 6 +-
.../configuration/encryption_configuration.html | 6 +-
.../external_storage_configuration.html | 6 +-
.../external_storage_configuration_gui.html | 6 +-
.../configuration/file_sharing_configuration.html | 6 +-
.../configuration/files_locking_enabling.html | 6 +-
core/doc/admin/configuration/index.html | 7 +--
.../js_css_asset_management_configuration.html | 6 +-
.../configuration/knowledgebase_configuration.html | 6 +-
.../configuration/language_configuration.html | 6 +-
.../admin/configuration/logging_configuration.html | 6 +-
.../configuration/previews_configuration.html | 6 +-
.../configuration/reverse_proxy_configuration.html | 6 +-
.../admin/configuration/search_configuration.html | 6 +-
.../server_to_server_configuration.html | 6 +-
.../serving_static_files_configuration.html | 6 +-
.../thirdparty_php_configuration.html | 6 +-
.../configuration/user_auth_ftp_smb_imap.html | 6 +-
core/doc/admin/configuration/user_auth_ldap.html | 6 +-
.../admin/configuration/user_configuration.html | 6 +-
core/doc/admin/contents.html | 7 +--
core/doc/admin/genindex.html | 6 +-
core/doc/admin/index.html | 6 +-
.../admin/installation/appliance_installation.html | 6 +-
.../installation/apps_management_installation.html | 6 +-
.../admin/installation/hiawatha_configuration.html | 6 +-
core/doc/admin/installation/index.html | 6 +-
.../admin/installation/installation_wizard.html | 6 +-
.../admin/installation/lighttpd_configuration.html | 6 +-
.../doc/admin/installation/linux_installation.html | 6 +-
.../doc/admin/installation/macos_installation.html | 6 +-
.../admin/installation/nginx_configuration.html | 6 +-
.../admin/installation/others_installation.html | 6 +-
.../admin/installation/selinux_configuration.html | 6 +-
.../admin/installation/source_installation.html | 6 +-
core/doc/admin/installation/ucs_installation.html | 6 +-
.../admin/installation/windows_installation.html | 6 +-
.../doc/admin/installation/yaws_configuration.html | 6 +-
core/doc/admin/issues/index.html | 6 +-
core/doc/admin/maintenance/backup.html | 6 +-
core/doc/admin/maintenance/convert_db.html | 6 +-
core/doc/admin/maintenance/enable_maintenance.html | 6 +-
core/doc/admin/maintenance/index.html | 6 +-
core/doc/admin/maintenance/migrating.html | 6 +-
core/doc/admin/maintenance/restore.html | 6 +-
core/doc/admin/maintenance/update.html | 6 +-
core/doc/admin/maintenance/upgrade.html | 6 +-
core/doc/admin/objects.inv | Bin 296 -> 296 bytes
core/doc/admin/search.html | 6 +-
core/doc/admin/whats_new_admin.html | 6 +-
core/doc/user/_sources/documents.txt | 3 +-
core/doc/user/bookmarks.html | 8 +--
core/doc/user/contents.html | 10 ++--
core/doc/user/documents.html | 11 ++--
core/doc/user/external_storage/google_drive.html | 8 +--
.../user/files/configuring_big_file_upload.html | 8 +--
core/doc/user/files/deletedfiles.html | 8 +--
core/doc/user/files/encryption.html | 8 +--
core/doc/user/files/files.html | 8 +--
core/doc/user/files/filesweb.html | 8 +--
core/doc/user/files/index.html | 8 +--
core/doc/user/files/quota.html | 8 +--
core/doc/user/files/server_to_server_using.html | 8 +--
core/doc/user/files/sync.html | 8 +--
core/doc/user/files/versioncontrol.html | 8 +--
core/doc/user/genindex.html | 8 +--
core/doc/user/index.html | 10 ++--
core/doc/user/installing_apps.html | 8 +--
core/doc/user/objects.inv | Bin 295 -> 296 bytes
core/doc/user/pim/calendar.html | 8 +--
core/doc/user/pim/contacts.html | 8 +--
core/doc/user/pim/index.html | 8 +--
core/doc/user/pim/sync_ios.html | 8 +--
core/doc/user/pim/sync_kde.html | 8 +--
core/doc/user/pim/sync_osx.html | 8 +--
core/doc/user/pim/sync_thunderbird.html | 8 +--
core/doc/user/pim/troubleshooting.html | 8 +--
core/doc/user/search.html | 8 +--
core/doc/user/userpreferences.html | 8 +--
core/doc/user/webinterface.html | 8 +--
core/doc/user/whats_new.html | 10 ++--
lib/base.php | 10 +++-
version.php | 8 +--
99 files changed, 351 insertions(+), 425 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list