Oskar Hahn 27c73092e1 Merge remote-tracking branch 'emanuel/newtemplate' into new_motion ... Conflicts: openslides/motion/templates/motion/overview.html openslides/motion/templates/motion/poll_view.html openslides/motion/templates/motion/view.html		2013-02-06 09:25:27 +01:00
..
motion	Merge remote-tracking branch 'emanuel/newtemplate' into new_motion	2013-02-06 09:25:27 +01:00
projector	Merge remote-tracking branch 'emanuel/newtemplate' into new_motion	2013-02-06 09:25:27 +01:00