Commit graph

2 commits

Author SHA1 Message Date
phalt
5e1432a677 fix conflicts 2014-12-15 10:03:41 +00:00
phalt
8a880fe60d changed pokemon_v1 to pokemon backwards compat 2014-12-15 10:01:53 +00:00
Renamed from pokemon_v1/tests.py (Browse further)