OpenSlides/openslides/motion/templates
Oskar Hahn a6fa8457cc Merge remote-tracking branch 'openslides/stable/1.5.x'
Conflicts:
	extras/win32-portable/create_portable.txt
	extras/win32-portable/prepare_portable.py
	openslides/motion/templates/motion/motion_list.html
	openslides/projector/templates/projector.html
	requirements_production.txt
2014-03-12 19:29:22 +01:00
..
motion Merge remote-tracking branch 'openslides/stable/1.5.x' 2014-03-12 19:29:22 +01:00
search Full text search with haystack and whoosh. 2013-10-16 08:58:35 +02:00