Oskar Hahn cde6232477 Merge branch 'stable/1.5.x' ... Conflicts: openslides/projector/projector.py openslides/templates/base.html		2014-01-11 22:30:14 +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.5.x'	2014-01-11 22:30:14 +01:00