Oskar Hahn 34b6ca80f3 Merge branch 'stable/1.6.x' ... Conflicts: CHANGELOG openslides/users/signals.py		2015-01-06 13:04:07 +01:00
..
assignment	Merge branch 'stable/1.6.x'	2015-01-06 13:04:07 +01:00
search	Full text search with haystack and whoosh.	2013-10-16 08:58:35 +02:00