From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Thu, 8 Oct 2009 10:40:01 +0000 (+0200)
Subject: Merge branch 'master' of stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/de93104a2513acc5a378496c6bf6ab7ed0d45d60?ds=sidebyside;hp=de93104a2513acc5a378496c6bf6ab7ed0d45d60

Merge branch 'master' of stigma:platforma

Conflicts:
	project/static/css/master.css
	project/static/js/models.js
---