fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa5a185 645219b)
Merge commit '645219bfa68384dad930269b94e2ddf8b4cd3488' into api
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 25 Mar 2011 11:33:20 +0000 (12:33 +0100)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Fri, 25 Mar 2011 11:33:20 +0000 (12:33 +0100)
1  2 
apps/catalogue/models.py patch | diff1 | diff2 | blob | history
wolnelektury/urls.py patch | diff1 | diff2 | blob | history

diff --cc apps/catalogue/models.py
Simple merge
diff --cc wolnelektury/urls.py
Simple merge