Merge branch '13.0' into 'mig/13.0/mass_mailing_partner'

Browse Source

# Conflicts:
#   .gitmodules

...

This commit is contained in:

Jared Kipe

2020-10-17 16:24:06 +00:00

parent c9e3b998c5 eb340935af

commit 8c40dc4a2b

283 changed files with 11608 additions and 13 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1

external/camptocamp-cloud-platform vendored Submodule

Submodule external/camptocamp-cloud-platform added at af8cee48fb

1

external/hibou-shipbox vendored Submodule

Submodule external/hibou-shipbox added at e0a0f3e9c6