Oskar Hahn 20cf960c82 Merge remote-tracking branch 'openslides/stable/1.4.x' ... Conflicts: openslides/core/templatetags/tags.py		2013-08-19 17:54:50 +02:00
..
__init__.py	Removed utils from INSTALLED_APPS.	2013-08-11 09:40:14 +02:00
tags.py	Merge remote-tracking branch 'openslides/stable/1.4.x'	2013-08-19 17:54:50 +02:00