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
..
templates/poll
__init__.py	Added Django's application configuration.	2014-12-10 17:16:58 +01:00
forms.py
models.py
views.py	Merge branch 'stable/1.6.x' into 'master'.	2015-01-02 22:11:56 +01:00