From 55c8d5aba25d5c1c77ff7e9435b05d3b356128bb Mon Sep 17 00:00:00 2001 From: Jared Kipe Date: Mon, 25 Nov 2024 17:26:31 +0000 Subject: [PATCH] Manual merge in 16.0, fix conflict --- .gitmodules | 3 +++ .vendor/oca-social | 1 + mass_mailing_list_dynamic | 1 + mass_mailing_partner | 1 + 4 files changed, 6 insertions(+) create mode 160000 .vendor/oca-social create mode 120000 mass_mailing_list_dynamic create mode 120000 mass_mailing_partner diff --git a/.gitmodules b/.gitmodules index 03db76f4..e00d19ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,3 +25,6 @@ [submodule ".vendor/oca-web"] path = .vendor/oca-web url = https://github.com/hibou-io/oca-web.git +[submodule ".vendor/oca-social"] + path = .vendor/oca-social + url = https://github.com/hibou-io/oca-social.git diff --git a/.vendor/oca-social b/.vendor/oca-social new file mode 160000 index 00000000..fb34dbba --- /dev/null +++ b/.vendor/oca-social @@ -0,0 +1 @@ +Subproject commit fb34dbba901b0537d6e772f234e6f966eeea83cf diff --git a/mass_mailing_list_dynamic b/mass_mailing_list_dynamic new file mode 120000 index 00000000..6016b8fa --- /dev/null +++ b/mass_mailing_list_dynamic @@ -0,0 +1 @@ +./.vendor/oca-social/mass_mailing_list_dynamic \ No newline at end of file diff --git a/mass_mailing_partner b/mass_mailing_partner new file mode 120000 index 00000000..a5ebca1b --- /dev/null +++ b/mass_mailing_partner @@ -0,0 +1 @@ +./.vendor/oca-social/mass_mailing_partner \ No newline at end of file