diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-12 14:23:44 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-12 14:23:44 +0800 |
| commit | 2b73aafe971f6014634eafbf130cc666531026bc (patch) | |
| tree | 42f109a019316b074603107cac2d1011bc43e705 /.idea/other.xml | |
| parent | d7471a613fe1c8c4d3826648de705a65403ed6c2 (diff) | |
| parent | 36c65d17e29bcdbc27089d3b3eba177c8da549e8 (diff) | |
Merge branch 'python3.8' into python3.7
# Conflicts:
# utils/configuration.py
Diffstat (limited to '.idea/other.xml')
0 files changed, 0 insertions, 0 deletions