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
..
category_form.html	Fixed some (pdf) template issues and updated (DE) translation.	2013-06-15 17:50:30 +02:00
category_list.html	Rework (projector) template with bootstrap.	2013-10-07 08:57:22 +02:00
motion_detail.html	Move projector.models.ProjectorSlide to core.models.CustomSlide	2014-01-28 08:32:26 +01:00
motion_diff.html	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
motion_form_csv_import.html	Fixed some (pdf) template issues and updated (DE) translation.	2013-06-15 17:50:30 +02:00
motion_form.html	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
motion_list.html	Merge remote-tracking branch 'openslides/stable/1.5.x'	2014-03-12 19:29:22 +01:00
poll_form.html	Move projector.models.ProjectorSlide to core.models.CustomSlide	2014-01-28 08:32:26 +01:00
slide.html	Fixed a lot of template bugs.	2013-11-20 22:05:10 +01:00
widget_motion.html	New API for widgets using a metaclass.	2013-12-01 21:30:12 +01:00