Oskar Hahn 34b6ca80f3 Merge branch 'stable/1.6.x' ... Conflicts: CHANGELOG openslides/users/signals.py		2015-01-06 13:04:07 +01:00
..
search	Refactory of the participant app	2014-10-12 10:06:54 +02:00
users	Merge branch 'stable/1.6.x'	2015-01-06 13:04:07 +01:00