Merge branch 'mig/13.0/attachment_minio' into 13.0-test

# Conflicts:
#	.gitmodules
This commit is contained in:
Jared Kipe
2020-07-02 09:34:55 -07:00
9 changed files with 277 additions and 0 deletions

3
.gitmodules vendored
View File

@@ -13,3 +13,6 @@
[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