Merge branch 'master' of https://github.com/RichardGottschalk/pokedex

Browse source

Conflicts:
	pokedex/data/csv/language_names.csv

...

This commit is contained in:

RichardGottschalk 2014-06-01 15:24:52 +02:00

parent e628edd40f aff3278f60

commit 909de36160

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available