fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 1e9113a)
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)
Conflicts:
apps/catalogue/templates/catalogue/book_short.html
apps/picture/templates/picture/picture_short.html
wolnelektury/settings/static.py


No differences found