fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: d52c760)
Merge branch 'pretty' of github.com:fnp/wolnelektury into pretty
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 30 Dec 2011 08:45:20 +0000 (09:45 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 30 Dec 2011 08:45:20 +0000 (09:45 +0100)
Conflicts:
apps/catalogue/management/commands/importbooks.py
wolnelektury/templates/catalogue/book_detail.html
wolnelektury/templates/catalogue/book_short.html


No differences found