fnp / redakcja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25880e3 1fc8724)
Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma
authorzuber <marek@stepniowski.com>
Tue, 25 Aug 2009 15:09:01 +0000 (17:09 +0200)
committerzuber <marek@stepniowski.com>
Tue, 25 Aug 2009 15:09:01 +0000 (17:09 +0200)
1  2 
apps/explorer/views.py patch | diff1 | diff2 | blob | history
project/static/css/master.css patch | diff1 | diff2 | blob | history
project/templates/explorer/file_xml.html patch | diff1 | diff2 | blob | history

diff --cc apps/explorer/views.py
Simple merge
diff --cc project/static/css/master.css
Simple merge