OpenSlides/openslides/motion
Oskar Hahn 051723e686 Merge branch 'master' of github.com:OpenSlides/OpenSlides
Conflicts:
	openslides/motion/models.py
	openslides/motion/workflow.py
2013-02-18 18:31:35 +01:00
..
fixtures Work on motion workflow system. 2013-02-13 23:04:24 +01:00
templates Work on motion workflow system. 2013-02-13 23:04:24 +01:00
__init__.py Work on motion workflow system. 2013-02-13 23:04:24 +01:00
exceptions.py Move motion exceptions to its own file in the motion app. 2013-02-14 19:27:36 +01:00
forms.py Work on motion workflow system. 2013-02-13 23:04:24 +01:00
models.py Fix PEP8 and tests. 2013-02-17 17:07:44 +01:00
pdf.py Work on motion workflow system. 2013-02-13 23:04:24 +01:00
signals.py Work on motion workflow system. 2013-02-13 23:04:24 +01:00
slides.py Work on motion workflow system. 2013-02-13 23:04:24 +01:00
urls.py Work on motion workflow system. 2013-02-13 23:04:24 +01:00
views.py Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-02-18 18:31:35 +01:00
workflow.py Comment the dev-file workflow.py 2013-02-14 11:16:46 +01:00