OpenSlides/docs
Norman Jäckel dcd8b7a639 Merge branch 'stable/1.6.x' into 'master'.
Conflicts:
	CHANGELOG
	openslides/agenda/views.py
	openslides/assignment/views.py
	openslides/mediafile/views.py
	openslides/users/views.py
	openslides/utils/views.py
	tests/motion/test_pdf.py
	tests/settings.py
2015-01-02 22:11:56 +01:00
..
_images Updated documentation for 1.5 2013-11-25 17:14:11 +01:00
_static Updated documentation for 1.5 2013-11-25 17:14:11 +01:00
de Added possibility to hide motions from non staff users in some states. 2015-01-02 19:32:56 +01:00
en Prepration for new OpenSlides documentation with Sphinx. 2012-03-12 08:39:35 +01:00
extensions Use python3 2014-08-24 21:21:11 +02:00
conf.py Use python3 2014-08-24 21:21:11 +02:00
make.bat Updated makefiles. 2012-03-31 16:45:28 +02:00
Makefile Updated documentation for 1.5 2013-11-25 17:14:11 +01:00