Oskar Hahn 7dcc2374f4 Merge remote-tracking branch 'openslides/master' into supporter ... Conflicts: openslides/application/urls.py openslides/motion/models.py openslides/motion/views.py		2012-10-25 09:23:24 +02:00
..
templates	rename application to motion	2012-10-24 11:07:36 +02:00
__init__.py	rename application to motion	2012-10-24 11:07:36 +02:00
forms.py	rename application to motion	2012-10-24 11:07:36 +02:00
models.py	Merge remote-tracking branch 'openslides/master' into supporter	2012-10-25 09:23:24 +02:00
tests.py	rename application to motion	2012-10-24 11:07:36 +02:00
urls.py	rename application to motion	2012-10-24 11:07:36 +02:00
views.py	Merge remote-tracking branch 'openslides/master' into supporter	2012-10-25 09:23:24 +02:00