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
..
css	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
fonts	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
img	Merge commit '7addd69050a69b9d02aacba116939829497ca338' into MergeStablePart2	2014-04-07 22:35:52 +02:00
js	Merge part of stable/1.5.x into master.	2014-04-08 20:33:07 +02:00