fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a6554d6 655700e)
Merge branch 'custompdf'
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 29 Mar 2012 09:59:12 +0000 (11:59 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 29 Mar 2012 09:59:12 +0000 (11:59 +0200)
Conflicts:
wolnelektury/settings/__init__.py

1  2 
apps/catalogue/models.py patch | diff1 | diff2 | blob | history
apps/catalogue/utils.py patch | diff1 | diff2 | blob | history

diff --cc apps/catalogue/models.py
Simple merge
diff --cc apps/catalogue/utils.py
Simple merge