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

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

7
.gitmodules vendored
View File

@@ -13,3 +13,10 @@
[submodule "external/hibou-oca/social"]
path = external/hibou-oca/social
url = https://github.com/hibou-io/oca-social.git
[submodule "external/camptocamp-cloud-platform"]
path = external/camptocamp-cloud-platform
url = https://github.com/hibou-io/camptocamp-cloud-platform
[submodule "external/hibou-shipbox"]
path = external/hibou-shipbox
url = https://gitlab.com/hibou-io/hibou-odoo/shipbox.git
>>>>>>> .gitmodules