Emanuel Schuetze e101fb8212 Merge branch 'master' into agenda-orga-items ...

Conflicts:
	openslides/agenda/static/styles/agenda.css
	openslides/agenda/templates/agenda/config.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/static/styles/base.css
	requirements.txt

2013-02-11 22:36:19 +01:00

28 KiB

Raw History

View Raw