OpenSlides/openslides/assignment/templates
Oskar Hahn 0a24b7267b Merge branch 'stable/1.6.x'
Conflicts:
	CHANGELOG
	README.rst
	openslides/assignment/models.py
	openslides/users/forms.py
	requirements_production.txt
	tests/settings.py
2015-01-17 10:18:29 +01:00
..
assignment Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
search Template improvements for tags of agenda items, motions and 2015-01-05 13:57:37 +01:00