OpenSlides/openslides/projector/templates
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
..
projector Merge branch 'stable/1.5.x' 2014-01-11 22:30:14 +01:00
projector.html Fixed a lot of template bugs. 2013-11-20 22:05:10 +01:00