Emanuel Schütze 3d7ecab8e4 Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2 ... Conflicts: extras/win32-portable/create_portable.txt extras/win32-portable/prepare_portable.py openslides/assignment/views.py openslides/core/static/img/circle.png openslides/motion/pdf.py openslides/utils/pdf.py		2014-04-07 22:35:52 +02: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 commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00