audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Manual merge in 16.0, fix conflict

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -25,3 +25,6 @@
[submodule ".vendor/oca-web"] [submodule ".vendor/oca-web"]
path = .vendor/oca-web path = .vendor/oca-web
url = https://github.com/hibou-io/oca-web.git 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

1
.vendor/oca-social Submodule

Submodule .vendor/oca-social added at fb34dbba90

1
mass_mailing_list_dynamic Symbolic link
View File

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

1
mass_mailing_partner Symbolic link
View File

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