@ -5,3 +5,9 @@ py3o.template
PyPDF2
py3o.formats
zeep
parse-accept-language
pyquerystring
cerberus==1.3.2
apispec>=4.0.0
marshmallow
marshmallow-objects>=2.0.0
@ -42,3 +42,5 @@ learning_addons:
- "*"
muk-web:
rest-framework:
@ -255,3 +255,14 @@
target: origin 14.0
merges:
- origin 14.0
./rest-framework:
defaults:
# Shallow repositories ($DEPTH_DEFAULT=1) are faster & thinner
# You may need a bigger depth when merging PRs (use $DEPTH_MERGE
# for a sane value of 100 commits)
depth: $DEPTH_DEFAULT
remotes:
oca: https://github.com/OCA/rest-framework.git
target: oca 14.0
- oca 14.0