fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4497f6 fa0414c)
Merge branch 'master' of http://github.com/fnp/wolnelektury
authorLukasz <lukasz@anwajler.com>
Wed, 2 Jun 2010 00:35:24 +0000 (02:35 +0200)
committerLukasz <lukasz@anwajler.com>
Wed, 2 Jun 2010 00:35:24 +0000 (02:35 +0200)
1  2 
apps/catalogue/forms.py patch | diff1 | diff2 | blob | history
apps/catalogue/views.py patch | diff1 | diff2 | blob | history
wolnelektury/static/css/master.css patch | diff1 | diff2 | blob | history

diff --cc apps/catalogue/forms.py
Simple merge
diff --cc apps/catalogue/views.py
Simple merge
diff --cc wolnelektury/static/css/master.css
Simple merge