Oskar Hahn a6fa8457cc Merge remote-tracking branch 'openslides/stable/1.5.x' ... Conflicts: extras/win32-portable/create_portable.txt extras/win32-portable/prepare_portable.py openslides/motion/templates/motion/motion_list.html openslides/projector/templates/projector.html requirements_production.txt		2014-03-12 19:29:22 +01:00
..
benchmark	Change to MIT Licence	2013-11-04 14:57:30 +01:00
csv-examples	Updated csv example files for motion and participants - in DE and EN used in demo database.	2013-07-08 10:11:48 +02:00
logo	Added eps file of logo (wide variante).	2012-07-12 16:50:56 +02:00
openslides_gui	remove the last occurence of gnu gpl license header fix #1130	2013-12-01 22:52:08 +01:00
scripts	Change to MIT Licence	2013-11-04 14:57:30 +01:00
win32-portable	Merge remote-tracking branch 'openslides/stable/1.5.x'	2014-03-12 19:29:22 +01:00