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
..
data	Add a simple wxPython based gui frontend for openslides	2013-06-04 00:07:22 +02:00
__init__.py	Add a simple wxPython based gui frontend for openslides	2013-06-04 00:07:22 +02:00
__main__.py	Add a simple wxPython based gui frontend for openslides	2013-06-04 00:07:22 +02:00
gui.py	Merge branch 'stable/1.7.x'	2015-01-23 02:33:17 +01:00