diff options
| author | IT Fixcomart <it@fixcomart.co.id> | 2022-10-05 15:23:17 +0700 |
|---|---|---|
| committer | IT Fixcomart <it@fixcomart.co.id> | 2022-10-05 15:23:17 +0700 |
| commit | 06a5c0c589a00c036684285766eeddbdd0c39fcb (patch) | |
| tree | 434c4bda203401f861ea39a01e8643ae4d38ac6d /indoteknik_api/controllers/controller.py | |
| parent | 14cb30c3f2fb8b15baaf32ab9fca7bb9bda73845 (diff) | |
| parent | 3abd0ca6790b9a278f9ddd52b063691b99d6916c (diff) | |
Merge branch 'master' of bitbucket.org:altafixco/indoteknik-addons
# Conflicts:
# indoteknik_custom/models/__init__.py
Diffstat (limited to 'indoteknik_api/controllers/controller.py')
0 files changed, 0 insertions, 0 deletions