OpenSlides/openslides/agenda
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
..
static Merge remote branch 'upstream/master' into newtemplate 2013-01-02 23:01:43 +01:00
templates Removed unused base_agenda.html template. 2012-09-10 23:37:59 +02:00
__init__.py Updated license header. 2012-04-25 22:29:19 +02:00
forms.py cleanup 2012-11-24 14:01:21 +01:00
models.py cleanup 2012-11-24 14:01:21 +01:00
slides.py #286 import error in the agenda overview slide 2012-07-12 14:06:58 +02:00
urls.py cleanup openslides base files. 2012-07-10 14:00:51 +02:00
views.py Merge remote branch 'upstream/master' into newtemplate 2013-01-02 23:01:43 +01:00