Oskar Hahn 5c6f7a41a8 Merge branch 'stable/1.6.x' ... Conflicts: tests/assignment/test_views.py		2014-10-18 08:53:51 +02: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	Use python3	2014-08-24 21:21:11 +02:00