Merge branch 'master' into funding
authorAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Fri, 21 Jun 2013 14:02:46 +0000 (16:02 +0200)
committerAleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Fri, 21 Jun 2013 14:02:46 +0000 (16:02 +0200)
commit5f176bb52a7a59bf88f5728e60a3a62e12fb3d54
tree70b5cf55107e5247688dfdda34fb582ad92ee238
parent45632aee424aa72050e905718457d7a7203ead30
parent4519647fb81cda70bb827de97b0bcedb933ea200
Merge branch 'master' into funding
apps/pdcounter/templates/pdcounter/author_detail.html
apps/pdcounter/templates/pdcounter/book_stub_detail.html
apps/wolnelektury_core/static/css/main_page.css
apps/wolnelektury_core/templates/superbase.html
wolnelektury/settings/__init__.py
wolnelektury/settings/static.py
wolnelektury/urls.py