Oskar Hahn 8b88d38ac5 Merge branch 'stable/1.7.x' ... Conflicts: openslides/__init__.py openslides/assignment/views.py openslides/motion/pdf.py openslides/users/pdf.py		2015-01-23 02:33:17 +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	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00
scripts	Use python3	2014-08-24 21:21:11 +02:00
win32-portable	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00