Oskar Hahn 5353053d29 Merge branch 'stable/1.2.x' ... Conflicts: openslides/application/views.py		2012-08-08 11:21:36 +02:00
..
templates	updated some parts of OpenSlides to the new user-api	2012-08-04 15:15:11 +02:00
__init__.py	Add code	2011-07-31 10:46:29 +02:00
forms.py	rename some user api and participant names	2012-08-07 22:43:57 +02:00
models.py	rename some user api and participant names	2012-08-07 22:43:57 +02:00
tests.py	Merge branch 'stable/1.2.x'	2012-08-08 11:21:36 +02:00
urls.py	cleanup openslides base files.	2012-07-10 14:00:51 +02:00
views.py	rename some user api and participant names	2012-08-07 22:43:57 +02:00