OpenSlides/openslides/motion/templates
Emanuel Schuetze 247f6c9431 Merge remote branch 'upstream/master' into motiontemplate
Conflicts:
	openslides/motion/models.py
	openslides/motion/views.py
2013-03-14 21:36:02 +01:00
..
motion Merge remote branch 'upstream/master' into motiontemplate 2013-03-14 21:36:02 +01:00
projector Merge remote-tracking branch 'emanuel/newtemplate' into new_motion 2013-02-06 09:25:27 +01:00