2 Commits

Author	SHA1	Message	Date
Oskar Hahn	a6fa8457cc	Merge remote-tracking branch 'openslides/stable/1.5.x' ... Conflicts: extras/win32-portable/create_portable.txt extras/win32-portable/prepare_portable.py openslides/motion/templates/motion/motion_list.html openslides/projector/templates/projector.html requirements_production.txt	2014-03-12 19:29:22 +01:00
Emanuel Schuetze	d8d2ad002a	Rename and clean up static direcories. ... - rename static subdirs to css and js - move global static dir to core/static, changed - move global templates dir to core/templates - check comments and code style of all our own CSS and JS files - minor changes related to the changes of template and static files	2014-01-14 23:27:12 +01:00