Merge branch 'new/15.0/mail_debrand_mail_activity_board' into 15.0

# Conflicts:
#	.gitmodules
This commit is contained in:
Jared Kipe
2022-05-23 09:26:14 -07:00
5 changed files with 7 additions and 0 deletions

3
.gitmodules vendored
View File

@@ -25,3 +25,6 @@
[submodule "external/hibou-oca/web"]
path = external/hibou-oca/web
url = https://github.com/hibou-io/oca-web.git
[submodule "external/hibou-oca/social"]
path = external/hibou-oca/social
url = https://github.com/hibou-io/oca-social.git

1
external/hibou-oca/social vendored Submodule

1
mail_activity_board Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/social/mail_activity_board

1
mail_activity_done Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/social/mail_activity_done

1
mail_debrand Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/social/mail_debrand