From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Thu, 10 Sep 2009 15:02:03 +0000 (+0200)
Subject: Merge branch 'master' of git@stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/f31bb368a2cad9a61e4fc652fa4b40c4114a128c?ds=inline;hp=f31bb368a2cad9a61e4fc652fa4b40c4114a128c

Merge branch 'master' of git@stigma:platforma

Conflicts:
	project/static/js/editor.js
setupUI przeniesione do editor.ui.js
---