Oskar Hahn cde6232477 Merge branch 'stable/1.5.x' ... Conflicts: openslides/projector/projector.py openslides/templates/base.html		2014-01-11 22:30:14 +01:00
..
mediafile_form.html	Fixed some (pdf) template issues and updated (DE) translation.	2013-06-15 17:50:30 +02:00
mediafile_list.html	Merge branch 'stable/1.5.x'	2014-01-11 22:30:14 +01:00
presentation_slide.html	added possibility to show pdfs on the projector	2013-10-29 22:05:11 +01:00
widget_pdfpresentation.html	New API for widgets using a metaclass.	2013-12-01 21:30:12 +01:00