fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64cf4d8 ca9f237)
Merge branch 'minimal-double-reader' into rwd
authorRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 19 Nov 2013 13:12:55 +0000 (14:12 +0100)
committerRadek Czajka <radekczajka@nowoczesnapolska.org.pl>
Tue, 19 Nov 2013 13:12:55 +0000 (14:12 +0100)
1  2 
apps/catalogue/models/book.py patch | diff1 | diff2 | blob | history
wolnelektury/settings/static.py patch | diff1 | diff2 | blob | history

diff --cc apps/catalogue/models/book.py
Simple merge
diff --cc wolnelektury/settings/static.py
Simple merge