Oskar Hahn 424d10cb63 Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1' ... Conflicts: openslides/__init__.py openslides/projector/views.py		2012-10-31 15:27:47 +01:00
..
projector	Merge remote-tracking branch 'norman/Some_Fixes_for_1_3_b1'	2012-10-31 15:27:47 +01:00
base-projector.html	Redesign overlays.	2012-04-26 08:52:20 +02:00