projects / zzz-pokedex.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c94dcb 20b21d9)
Merge branch 'encukou'
authorEevee <git@veekun.com>
Wed, 6 Apr 2011 04:04:32 +0000 (21:04 -0700)
committerEevee <git@veekun.com>
Wed, 6 Apr 2011 04:04:32 +0000 (21:04 -0700)
1  2 
pokedex/db/multilang.py patch | diff1 | diff2 | blob | history

diff --cc pokedex/db/multilang.py
Simple merge
Original pokedex repository, before media was split off