fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc572f0 dcae693)
Merge branch 'master' of http://github.com/fnp/wolnelektury
authorLukasz <lukasz@anwajler.com>
Wed, 2 Jun 2010 03:31:20 +0000 (05:31 +0200)
committerLukasz <lukasz@anwajler.com>
Wed, 2 Jun 2010 03:31:20 +0000 (05:31 +0200)
1  2 
wolnelektury/static/css/master.css patch | diff1 | diff2 | blob | history
wolnelektury/static/js/catalogue.js patch | diff1 | diff2 | blob | history

diff --cc wolnelektury/static/css/master.css
Simple merge
diff --cc wolnelektury/static/js/catalogue.js
Simple merge