Merge branch 'new/13.0/web_m2x_options' into 13.0-test

# Conflicts:
#	.gitmodules
This commit is contained in:
Kaylie Kipe
2021-09-22 11:47:20 -07:00
3 changed files with 5 additions and 0 deletions

3
.gitmodules vendored
View File

@@ -29,4 +29,7 @@
path = external/hibou-oca/stock-logistics-warehouse path = external/hibou-oca/stock-logistics-warehouse
url = https://github.com/hibou-io/oca-stock-logistics-warehouse.git url = https://github.com/hibou-io/oca-stock-logistics-warehouse.git
branch = 13.0 branch = 13.0
[submodule "external/hibou-oca/web"]
path = external/hibou-oca/web
url = https://github.com/hibou-io/oca-web.git

1
external/hibou-oca/web vendored Submodule

Submodule external/hibou-oca/web added at dd10971a39

1
web_m2x_options Symbolic link
View File

@@ -0,0 +1 @@
./external/hibou-oca/web/web_m2x_options