Oskar Hahn 7bcfa16737 Merge branch 'master' of github.com:OpenSlides/OpenSlides into new_motion ... Conflicts: openslides/motion/templates/motion/view.html openslides/utils/views.py		2013-01-26 17:57:35 +01:00
..
agenda	Import urls.py needed django functions from django.conf.urls	2013-01-05 01:05:38 +01:00
assignment	Import urls.py needed django functions from django.conf.urls	2013-01-05 01:05:38 +01:00
config	Import urls.py needed django functions from django.conf.urls	2013-01-05 01:05:38 +01:00
locale	Fixed missing translation.	2012-12-10 20:34:37 +01:00
motion	Let the user choose if the motion should have a new version	2013-01-26 17:09:13 +01:00
participant	Start to rewrite the motion app	2013-01-08 20:22:03 +01:00
poll	cleanup	2012-11-24 14:01:21 +01:00
projector	Import urls.py needed django functions from django.conf.urls	2013-01-05 01:05:38 +01:00
static	Added missing remove icon (for unsupport motion button).	2012-12-10 19:44:35 +01:00
templates	Updated the url template tag	2012-12-14 15:10:14 +01:00
utils	Added motion config tab	2013-01-26 16:33:55 +01:00
__init__.py	Update openslides/__init__.py	2013-01-04 11:49:43 +01:00
global_settings.py	Let the user choose the language in his settings	2012-12-16 17:26:53 +01:00
main.py	Add an option to suppress starting of web browser (closes #436)	2013-01-22 21:04:07 +01:00
urls.py	Import urls.py needed django functions from django.conf.urls	2013-01-05 01:05:38 +01:00