From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Thu, 19 Dec 2013 11:47:39 +0000 (+0100)
Subject: Merge branch 'obrazy' into rwd
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/ab8ffbde2df33d9c699e029ba613d2b014ba44b8?hp=ab8ffbde2df33d9c699e029ba613d2b014ba44b8

Merge branch 'obrazy' into rwd

Conflicts:
	apps/catalogue/locale/pl/LC_MESSAGES/django.mo
	apps/catalogue/locale/pl/LC_MESSAGES/django.po
	apps/wolnelektury_core/static/css/base.css
	apps/wolnelektury_core/static/css/book_box.css
	apps/wolnelektury_core/static/css/cite.css
	apps/wolnelektury_core/static/css/header.css
	apps/wolnelektury_core/static/css/master.book.css
	apps/wolnelektury_core/static/css/picture_box.css
	apps/wolnelektury_core/static/css/screen.css
	wolnelektury/settings/static.py
---