Emanuel Schuetze 4ae7f3e243 Merge remote branch 'upstream/master' into newtemplate ... Conflicts: openslides/application/views.py openslides/assignment/templates/assignment/overview.html openslides/assignment/templates/assignment/view.html openslides/assignment/views.py openslides/locale/de/LC_MESSAGES/django.mo openslides/locale/de/LC_MESSAGES/django.po openslides/motion/templates/motion/config.html openslides/motion/templates/motion/edit.html openslides/motion/templates/motion/import.html openslides/motion/templates/motion/overview.html openslides/motion/templates/motion/poll_view.html openslides/motion/templates/motion/view.html openslides/participant/templates/participant/base_participant.html openslides/participant/templates/participant/config.html openslides/participant/templates/participant/group_edit.html openslides/participant/templates/participant/group_overview.html openslides/participant/templates/participant/overview.html openslides/projector/templates/projector/base_projector.html openslides/projector/templates/projector/dashboard.html openslides/projector/templates/projector/live_view_widget.html openslides/static/styles/base.css openslides/templates/base.html openslides/templates/front_page.html openslides/utils/utils.py		2013-01-02 23:01:43 +01:00
..
403.html	create setup.py to install openslides	2012-02-09 16:57:10 +01:00
404.html	fix some typos, mostly {%trans to {% trans	2012-07-16 14:00:29 +02:00
500.html	fix some typos, mostly {%trans to {% trans	2012-07-16 14:00:29 +02:00
base.html	Merge remote branch 'upstream/master' into newtemplate	2013-01-02 23:01:43 +01:00
form.html	Adjusted new template for participant app. Added new generic form.	2012-09-06 22:41:24 +02:00
formbuttons_save.html	Adjusted new template for participant app. Added new generic form.	2012-09-06 22:41:24 +02:00
formbuttons_saveapply.html	Adjusted new template for participant app. Added new generic form.	2012-09-06 22:41:24 +02:00