Merge branch 'master' into production
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 11 Jun 2013 13:51:09 +0000 (15:51 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 11 Jun 2013 13:51:09 +0000 (15:51 +0200)
commit70e52697f5d41c6658b03b739378a2a2139355e8
treefb73ccee1d8e653441eb690f5a26dec8d88165ef
parent91f1ca96d8245cccc40b0b807c75638df4be9750
parenta06e9d248d2e085d9d071db24bc8cc1aa6dc8ed5
Merge branch 'master' into production
apps/catalogue/templates/catalogue/book_text.html
wolnelektury/settings/__init__.py