From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Fri, 28 Aug 2009 09:53:13 +0000 (+0200)
Subject: Merge branch 'master' of git@stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/0602376974810e6709409a69b010c5a68b5c3040?ds=sidebyside;hp=0602376974810e6709409a69b010c5a68b5c3040

Merge branch 'master' of git@stigma:platforma

Conflicts:

	project/static/js/editor.js
	project/templates/explorer/editor.html
---