diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-03-22 20:50:30 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-03-22 20:50:30 +0800 |
| commit | 4a4506fde7867df4d4d446c8992621fb0da03939 (patch) | |
| tree | c2cedb06e538c6c66cc8fe9dd7f47e00b66cc98e /.idea/vcs.xml | |
| parent | f9f45c8d32c6f99c314f1ca93140598d1005c8fb (diff) | |
| parent | b6e5972b64cc61fc967cf3d098fc629d781adce4 (diff) | |
Merge branch 'master' into python3.8
# Conflicts:
# models/model.py
Diffstat (limited to '.idea/vcs.xml')
0 files changed, 0 insertions, 0 deletions