mirror of
https://github.com/veekun/pokedex.git
synced 2024-08-20 18:16:34 +00:00
Merge remote-tracking branch 'origin/encukou-whoosh'
Conflicts: setup.py
This commit is contained in:
commit
66988fb070
Conflicts: setup.py