veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity
veekun_pokedex/pokedex/data
History
Lynn "Zhorken" Vaughan b8ece53720 Merge master branch into branch 'black-and-white-2' 
Conflicts:
	pokedex/data/csv/pokemon_forms.csv
	pokedex/data/csv/pokemon_species.csv
2012-06-21 14:21:11 -04:00
..
csv Merge master branch into branch 'black-and-white-2' 2012-06-21 14:21:11 -04:00