OpenSlides/openslides/core/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
..
core Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
base.html Merge branch 'stable/1.6.x' 2015-01-17 10:18:29 +01:00
form.html Prepared for release. 2014-05-19 22:55:54 +02:00
formbuttons_save.html Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00
formbuttons_saveapply.html Rename and clean up static direcories. 2014-01-14 23:27:12 +01:00