OpenSlides/openslides
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
..
agenda Merge remote-tracking branch 'emanuel/newtemplate' into new_motion 2013-02-06 09:25:27 +01:00
assignment Merge remote-tracking branch 'emanuel/newtemplate' into new_motion 2013-02-06 09:25:27 +01:00
config Updated some views for the new utils.views style 2013-02-03 19:43:36 +01:00
locale Updated translation. 2013-02-05 23:09:23 +01:00
motion Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-02-18 18:31:35 +01:00
participant Merge remote-tracking branch 'emanuel/newtemplate' into new_motion 2013-02-06 09:25:27 +01:00
poll Changed utils.- and poll.views 2013-02-01 12:51:01 +01:00
projector Merge remote-tracking branch 'emanuel/newtemplate' into new_motion 2013-02-06 09:25:27 +01:00
static template: Added new css class for minimum column width. 2013-02-05 22:03:43 +01:00
templates template: minor style changes 2013-02-05 23:42:30 +01:00
utils Work on motion workflow system. 2013-02-13 23:04:24 +01:00
__init__.py Merged (conflicts). 2013-01-05 15:29:57 +01:00
global_settings.py Work on motion workflow system. 2013-02-13 23:04:24 +01:00
main.py Add an option to suppress starting of web browser (closes #436) 2013-01-22 21:04:07 +01:00
urls.py Fixed URLs in projector views 2013-02-02 00:26:08 +01:00