fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 0ee9de1)
Merge branch 'master' of git@github.com:fnp/wolnelektury
authorLukasz Anwajler <lukasz@anwajler.com>
Fri, 27 Aug 2010 09:43:53 +0000 (04:43 -0500)
committerLukasz Anwajler <lukasz@anwajler.com>
Fri, 27 Aug 2010 09:43:53 +0000 (04:43 -0500)
Conflicts:

apps/catalogue/locale/pl/LC_MESSAGES/django.po
apps/catalogue/locale/uk/LC_MESSAGES/django.mo
apps/catalogue/locale/uk/LC_MESSAGES/django.po
wolnelektury/locale/pl/LC_MESSAGES/django.mo
wolnelektury/locale/pl/LC_MESSAGES/django.po
wolnelektury/locale/uk/LC_MESSAGES/django.mo
wolnelektury/locale/uk/LC_MESSAGES/django.po


No differences found