diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-03-15 20:29:42 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-03-15 20:29:42 +0800 |
| commit | 6a24467e5c1417a9e41db583ea11cc72d561669c (patch) | |
| tree | 09c4e67ea3447cfc66513d4400ec8eddb76bcdd5 /.idea/other.xml | |
| parent | f953000c5b9490c040b68cbc233518c756ac00ab (diff) | |
| parent | 03d38fe32d668c28d7cba01f0b2e227f32b954c1 (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