From: zuber <marek@stepniowski.com>
Date: Thu, 15 Oct 2009 16:33:42 +0000 (+0200)
Subject: Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/3193141f55df20910cf8ba35f9e669d79c90d3f4?hp=3193141f55df20910cf8ba35f9e669d79c90d3f4

Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

Conflicts:
	platforma/templates/explorer/edit_dc.html
	platforma/templates/explorer/edit_text.html
	platforma/templates/explorer/file_html.html
	platforma/templates/explorer/split.html
	platforma/templates/explorer/split_success.html
---