Oskar Hahn cde6232477 Merge branch 'stable/1.5.x' ... Conflicts: openslides/projector/projector.py openslides/templates/base.html		2014-01-11 22:30:14 +01:00
..
mediafile	Merge branch 'stable/1.5.x'	2014-01-11 22:30:14 +01:00
search	Full text search with haystack and whoosh.	2013-10-16 08:58:35 +02:00