139ba74459
Conflicts: .travis.yml INSTALL.txt openslides/agenda/templates/agenda/base_agenda.html openslides/agenda/templates/agenda/edit.html openslides/agenda/templates/agenda/item_row.html openslides/agenda/templates/agenda/overview.html openslides/agenda/templates/agenda/widget.html openslides/assignment/templates/assignment/base_assignment.html openslides/assignment/templates/assignment/config.html openslides/assignment/templates/assignment/edit.html openslides/assignment/templates/assignment/overview.html openslides/assignment/templates/assignment/poll_view.html openslides/assignment/templates/assignment/view.html openslides/assignment/templates/assignment/widget.html openslides/config/templates/config/general.html openslides/motion/templates/motion/base_motion.html 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/motion/templates/motion/widget.html openslides/motion/views.py openslides/participant/templates/participant/base_participant.html openslides/participant/templates/participant/config.html openslides/participant/templates/participant/edit.html openslides/participant/templates/participant/group_edit.html openslides/participant/templates/participant/group_widget.html openslides/participant/templates/participant/import.html openslides/participant/templates/participant/login.html openslides/participant/templates/participant/overview.html openslides/participant/templates/participant/password_change.html openslides/participant/templates/participant/settings.html openslides/participant/templates/participant/user_widget.html openslides/projector/templates/projector/base_projector.html openslides/projector/templates/projector/control_countdown.html openslides/projector/templates/projector/control_overlay_message.html openslides/projector/templates/projector/custom_slide_widget.html openslides/projector/templates/projector/live_view_widget.html openslides/projector/templates/projector/new.html openslides/projector/templates/projector/overlay_widget.html openslides/templates/base.html openslides/utils/template.py openslides/utils/views.py requirements.txt |
||
|---|---|---|
| .. | ||
| motion | ||
| projector | ||