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
..
glyphicons_054_clock_big.png	A lot of template improvements and translation fixes	2013-04-24 10:38:03 +02:00
logo-projector.png	Fixed #1138: Wrong file for projectors logo	2014-01-27 21:15:53 +01:00