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
..
css	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
fonts	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
img	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
js	Merge remote-tracking branch 'openslides/stable/1.5.x'	2014-03-12 19:29:22 +01:00