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
..
static	rewrote participant status view as class based view	2012-08-10 19:19:41 +02:00
templates/participant	rename openslidesuser to user and openslidesgroup to group	2012-08-12 12:52:38 +02:00
__init__.py	added name for participant app in __init__	2012-07-19 11:11:07 +02:00
api.py	rename openslidesuser to user and openslidesgroup to group	2012-08-12 12:52:38 +02:00
forms.py	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
middleware.py	rename openslidesuser to user and openslidesgroup to group	2012-08-12 12:52:38 +02:00
models.py	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
tests.py	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
urls.py	rewrote the group views as class based views	2012-08-11 10:09:54 +02:00
views.py	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00