diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-12 11:46:18 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-12 11:46:18 +0800 |
| commit | d7471a613fe1c8c4d3826648de705a65403ed6c2 (patch) | |
| tree | 692a8b54d6cc01aa82a0d906d5d89c3b7ba6a736 /.idea/other.xml | |
| parent | db7edf86af56aa76eaaa2b30f3b6568e401c7ecd (diff) | |
| parent | bbc2d84e59749e6fa1d87ffcc738419ff19a447e (diff) | |
Merge branch 'python3.8' into python3.7
# Conflicts:
# models/model.py
Diffstat (limited to '.idea/other.xml')
0 files changed, 0 insertions, 0 deletions