[FW][REM] base_ux: smtp disconnect exception added into odoo core

[fw-bot-adhoc]

Odoo included it: odoo/odoo@465f907

Forward-Port-Of: #263
Forward-Port-Of: #261

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@augusto-weiss @ALopez-Adhoc cherrypicking of pull request #261 failed.

stdout:

CONFLICT (modify/delete): base_ux/models/mail_mail.py deleted in 2e71928 ([REM] base_ux: smtp disconnect exception added into odoo core) and modified in HEAD. Version HEAD of base_ux/models/mail_mail.py left in tree.
Auto-merging base_ux/__manifest__.py
CONFLICT (content): Merge conflict in base_ux/__manifest__.py

stderr:

13:32:01.205388 git.c:444               trace: built-in: git cherry-pick 2e719288774924e2eabf91f70b0101675acfc299
error: could not apply 2e71928... [REM] base_ux: smtp disconnect exception added into odoo core
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

[ALopez-Adhoc]

@roboadhoc r+