Oskar Hahn 5c6f7a41a8 Merge branch 'stable/1.6.x' ... Conflicts: tests/assignment/test_views.py		2014-10-18 08:53:51 +02: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	Refactory of the participant app	2014-10-12 10:06:54 +02:00
test_pdf.py	Refactory of the participant app	2014-10-12 10:06:54 +02:00
test_views.py	Merge branch 'stable/1.6.x'	2014-10-18 08:53:51 +02:00