Oskar Hahn 27c73092e1 Merge remote-tracking branch 'emanuel/newtemplate' into new_motion ... Conflicts: openslides/motion/templates/motion/overview.html openslides/motion/templates/motion/poll_view.html openslides/motion/templates/motion/view.html		2013-02-06 09:25:27 +01:00
..
fixtures	removed initial_data	2012-11-25 00:55:25 +01:00
static/javascript	template: Removed unused participant.css	2013-02-05 21:51:09 +01:00
templates	template: minor style changes	2013-02-05 23:42:30 +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	Import urls.py needed django functions from django.conf.urls	2013-01-05 01:05:38 +01:00
views.py	Updated some views for the new utils.views style	2013-02-03 19:43:36 +01:00