[BOT] post-merge updates

README.md

@@ -22,6 +22,7 @@ Available addons
 addon | version | maintainers | summary
 --- | --- | --- | ---
 [mail_environment](mail_environment/) | 17.0.1.0.0 |  | Configure mail servers with server_environment_files
+[mail_environment_office365](mail_environment_office365/) | 17.0.1.0.0 |  | Configure Office365 parameters with environment variables via server_environment
 [server_environment](server_environment/) | 17.0.1.0.0 |  | move some configurations out of the database
 [server_environment_ir_config_parameter](server_environment_ir_config_parameter/) | 17.0.1.0.0 |  | Override System Parameters from server environment file
 

mail_environment_office365/README.rst

@@ -7,7 +7,7 @@ Server environment configuration for Office365
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:140769b380b4768097c619634969b0a9bc0017fb85f723eac4bea63265685f6a
+   !! source digest: sha256:640c32976a5a6b5c038ac63a57f0c312180cb04b30868bb44696c61fe8ef5798
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

mail_environment_office365/static/description/index.html

@@ -366,7 +366,7 @@ <h1 class="title">Server environment configuration for Office365</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:140769b380b4768097c619634969b0a9bc0017fb85f723eac4bea63265685f6a
+!! source digest: sha256:640c32976a5a6b5c038ac63a57f0c312180cb04b30868bb44696c61fe8ef5798
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/server-env/tree/17.0/mail_environment_office365"><img alt="OCA/server-env" src="https://img.shields.io/badge/github-OCA%2Fserver--env-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-env-17-0/server-env-17-0-mail_environment_office365"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/server-env&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to configure Office365 outgoing servers with

setup/_metapackage/pyproject.toml

@@ -1,8 +1,9 @@
 [project]
 name = "odoo-addons-oca-server-env"
-version = "17.0.20240125.1"
+version = "17.0.20240326.0"
 dependencies = [
     "odoo-addon-mail_environment>=17.0dev,<17.1dev",
+    "odoo-addon-mail_environment_office365>=17.0dev,<17.1dev",
     "odoo-addon-server_environment>=17.0dev,<17.1dev",
     "odoo-addon-server_environment_ir_config_parameter>=17.0dev,<17.1dev",
 ]