Oskar Hahn 34b6ca80f3 Merge branch 'stable/1.6.x' ... Conflicts: CHANGELOG openslides/users/signals.py		2015-01-06 13:04:07 +01:00
..
__init__.py	Wrote tests for openslides.motion.models.Motion	2013-02-01 19:19:18 +01:00
test_csv_import.py	Refactory of the participant app	2014-10-12 10:06:54 +02:00
test_models.py	Merge branch 'stable/1.6.x'	2015-01-06 13:04:07 +01:00
test_pdf.py	Merge branch 'stable/1.6.x' into 'master'.	2015-01-02 22:11:56 +01:00
test_views.py	Merge branch 'stable/1.6.x'	2015-01-06 13:04:07 +01:00