Merge remote-tracking branch 'origin/master'
# Conflicts: # src/agratek/api/merchant/views/vendor.py
Showing
21 changed files
with
2563 additions
and
672 deletions
alembic/README
0 → 100644
alembic/env.py
0 → 100644
alembic/script.py.mako
0 → 100644
src/agratek/api/merchant/views/odeo/test.py
0 → 100644
src/agratek/api/merchant/views/tedt.md
0 → 100644
src/agratek/api/merchant/views/test/test.py
0 → 100644
src/agratek/api/merchant/views/vsi/test.py
0 → 100644
-
Please register or sign in to post a comment