fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: ab8ffbd)
Merge branch 'obrazy' into rwd
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Thu, 19 Dec 2013 11:47:39 +0000 (12:47 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Thu, 19 Dec 2013 11:47:39 +0000 (12:47 +0100)
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


No differences found