Emanuel Schuetze 13cd52bd96 Merged (conflicts).		2013-01-05 15:29:57 +01:00
..
fixtures	removed initial_data	2012-11-25 00:55:25 +01:00
static	rewrote participant status view as class based view	2012-08-10 19:19:41 +02:00
templates	Merged (conflicts).	2013-01-05 15:29:57 +01:00
__init__.py	added name for participant app in __init__	2012-07-19 11:11:07 +02:00
api.py	Merged (conflicts).	2013-01-05 15:29:57 +01:00
forms.py	Merged (conflicts).	2013-01-05 15:29:57 +01:00
middleware.py	rename openslidesuser to user and openslidesgroup to group	2012-08-12 12:52:38 +02:00
models.py	Merge remote branch 'upstream/master'	2012-11-27 20:10:13 +01:00
urls.py	cleanup	2012-11-24 14:01:21 +01:00
views.py	Merged (conflicts).	2013-01-05 15:29:57 +01:00