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)
commit74dca79d402e43baaa69b760698429f223f98e3c
treeb5bb869655d1bfd6922053d6348bff42f765fdcf
parent25880e3bcf289743113655c7ec2fff4fd1587c2f
parent1fc8724242d7f5bbba51812a118d86aead57f32b
Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma
apps/explorer/views.py
project/static/css/master.css
project/templates/explorer/file_xml.html