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
..
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	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
js	Merge remote-tracking branch 'openslides/stable/1.5.x'	2014-03-12 19:29:22 +01:00