Oskar Hahn bd64a6cb5c Merge branch 'stable/1.2.x' ... Conflicts: openslides/application/models.py openslides/application/views.py openslides/participant/forms.py openslides/participant/views.py		2012-08-13 19:16:42 +02:00
..
templates	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
__init__.py	Add code	2011-07-31 10:46:29 +02:00
forms.py	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
models.py	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
tests.py	rename openslidesuser to user and openslidesgroup to group	2012-08-12 12:52:38 +02:00
urls.py	cleanup openslides base files.	2012-07-10 14:00:51 +02:00
views.py	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00