veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-07-03 02:55:49 +00:00
Code Issues Projects Releases Wiki Activity
veekun_pokedex/pokedex/data
History
Lynn "Zhorken" Vaughan cb3740a7e5 Merge branch 'conquest' 
Conflicts:
	pokedex/data/csv/pokemon_dex_numbers.csv
2012-09-25 21:00:02 -04:00
..
csv Merge branch 'conquest' 2012-09-25 21:00:02 -04:00