fnp / wolnelektury.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1aa9479 85800bc)
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)
commitab8ffbde2df33d9c699e029ba613d2b014ba44b8
treeb33b0867fd32e992af5cb7c39a478e5fa84326d0tree | snapshot
parent1aa94794c14bd4d64474f146963dd4550e79d516commit | diff
parent85800bcf632ba3e027667835b08f8e0dc5ab6177commit | diff
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
14 files changed:
apps/catalogue/locale/pl/LC_MESSAGES/django.mo diff1 | diff2 | blob | history
apps/catalogue/locale/pl/LC_MESSAGES/django.po diff1 | diff2 | blob | history
apps/catalogue/models/book.py diff1 | diff2 | blob | history
apps/catalogue/templates/catalogue/menu.html diff1 | diff2 | blob | history
apps/catalogue/templatetags/catalogue_tags.py diff1 | diff2 | blob | history
apps/wolnelektury_core/static/css/master.book.css diff1 | diff2 | blob | history
apps/wolnelektury_core/static/css/new.book.css diff1 | | blob | history
apps/wolnelektury_core/static/js/base.js diff1 | diff2 | blob | history
apps/wolnelektury_core/static/scss/book_text/box.scss diff1 | | blob | history
apps/wolnelektury_core/static/scss/main/base.scss diff1 | | blob | history
apps/wolnelektury_core/static/scss/main/book_box.scss diff1 | | blob | history
apps/wolnelektury_core/static/scss/main/fragment.scss diff1 | | blob | history
apps/wolnelektury_core/static/scss/main/menu.scss diff1 | | blob | history
wolnelektury/settings/static.py diff1 | diff2 | blob | history