Manual merge in 16.0, fix conflict

This commit is contained in:
Jared Kipe
2024-11-25 17:26:31 +00:00
parent 07d3f2f145
commit 55c8d5aba2
4 changed files with 6 additions and 0 deletions

1
mass_mailing_list_dynamic Symbolic link
View File

@@ -0,0 +1 @@
./.vendor/oca-social/mass_mailing_list_dynamic