Merge branch 'master' into rwd
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Fri, 10 Jan 2014 16:05:13 +0000 (17:05 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Fri, 10 Jan 2014 16:05:13 +0000 (17:05 +0100)
commit1e9113af163a3d002b0b9c3e8c339f22af5b848a
treedd7aa73842261b202d32c6507ac6acf2b16971b6
parent884be9d702f99a38cd9b04c4fdedca887286f35d
parent76849e4b3dcc3305edbe86b794b04a0bf4a8467c
Merge branch 'master' into rwd

Conflicts:
apps/catalogue/templates/catalogue/book_short.html
apps/picture/templates/picture/picture_short.html
wolnelektury/settings/static.py
apps/catalogue/models/book.py
apps/catalogue/templates/catalogue/book_detail.html
apps/catalogue/templates/catalogue/book_mini_box.html
apps/catalogue/templates/catalogue/book_short.html
apps/catalogue/templates/catalogue/viewer_base.html