fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 73ce961)
Merge branch 'production' into pretty
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 13 Jan 2012 16:05:36 +0000 (17:05 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Tue, 17 Jan 2012 14:17:44 +0000 (15:17 +0100)
Conflicts:
apps/catalogue/models.py
wolnelektury/settings.py
wolnelektury/templates/catalogue/main_page.html
wolnelektury/urls.py


No differences found