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
..
__init__.py	Insert new app to upload files via the frontend. Let tornado server media files. Insert icon-mediafile css class. Insert extra_stylfiles context variable.	2013-03-18 21:44:02 +01:00
tests.py	Merge branch 'stable/1.6.x' into 'master'.	2015-01-02 22:11:56 +01:00