fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ddaff85)
Merge branch 'master' into sunburnt
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 3 Sep 2012 14:55:43 +0000 (16:55 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 3 Sep 2012 14:55:43 +0000 (16:55 +0200)
Conflicts:
apps/catalogue/management/commands/importbooks.py
apps/catalogue/models/book.py


No differences found