Norman Jäckel e6dad6d087 Merge part of stable/1.5.x into master. ... Conflicts: CHANGELOG extras/win32-portable/create_portable.txt extras/win32-portable/prepare_portable.py openslides/__init__.py openslides/core/templates/base.html requirements_production.txt tests/config/test_config.py		2014-04-08 20:33:07 +02:00
..
__init__.py	Update default groups and permissions.	2013-04-02 15:50:40 +02:00
test_models.py	Move projector.models.ProjectorSlide to core.models.CustomSlide	2014-01-28 08:32:26 +01:00
test_umlaut_user.py	Change to MIT Licence	2013-11-04 14:57:30 +01:00
test_utils.py	Change to MIT Licence	2013-11-04 14:57:30 +01:00
test_views.py	Merge part of stable/1.5.x into master.	2014-04-08 20:33:07 +02:00