diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-23 00:47:46 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-23 00:47:46 +0800 |
| commit | afe615408c4003a513811d900fe3edd119a735a5 (patch) | |
| tree | 7ab780ab400d3a768a52ab1446884d05f04e8119 /.idea/other.xml | |
| parent | c0c8299354bd41bfd668ff0fb3edb5997f590c5d (diff) | |
| parent | a040400d7caa267d4bfbe8e5520568806f92b3d4 (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