Merge branch 'django-1.5'
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 9 Apr 2013 09:12:01 +0000 (11:12 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 9 Apr 2013 09:12:01 +0000 (11:12 +0200)
commite9f8a9269b64a5af7c95d6c2714b1ae97e68d6a1
tree660a7d7c66fcada2a9642db822b12d2c62ab87b8
parent63f47bb2d8f6aca7245c5e689ba4acfa9e97229b
parent2bdee8a54239c9020e2539c8ad0f1d34f7c5c7dc
Merge branch 'django-1.5'
apps/catalogue/templates/catalogue/book_text.html
apps/lesmianator/templates/lesmianator/poem.html
apps/wolnelektury_core/templates/main_page.html
apps/wolnelektury_core/templates/superbase.html