Oskar Hahn 0a24b7267b Merge branch 'stable/1.6.x' ... Conflicts: CHANGELOG README.rst openslides/assignment/models.py openslides/users/forms.py requirements_production.txt tests/settings.py		2015-01-17 10:18:29 +01:00
..
benchmark	Use python3	2014-08-24 21:21:11 +02:00
csv-examples	Fixed participant csv import for group id	2014-07-14 22:54:53 +02:00
logo	Added eps file of logo (wide variante).	2012-07-12 16:50:56 +02:00
openslides_gui	Use python3	2014-08-24 21:21:11 +02:00
scripts	Use python3	2014-08-24 21:21:11 +02:00
win32-portable	Merge branch 'stable/1.6.x'	2015-01-17 10:18:29 +01:00