From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Mon, 27 Aug 2012 12:20:35 +0000 (+0200)
Subject: Merge branch 'master' into search
X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/b1fb752ca1abb051a63da4729e34a80affc25c76?ds=sidebyside;hp=b1fb752ca1abb051a63da4729e34a80affc25c76

Merge branch 'master' into search

Conflicts:
	prawokultury/settings.d/30-apps.conf
	requirements.txt
---