fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 64cf4d8)
Merge branch 'master' into rwd
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 19 Nov 2013 13:10:35 +0000 (14:10 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 19 Nov 2013 13:10:35 +0000 (14:10 +0100)
Conflicts:
apps/catalogue/templates/catalogue/book_short.html
apps/funding/static/funding/funding.css
apps/wolnelektury_core/templates/main_page.html


No differences found