Emanuel Schuetze 247f6c9431 Merge remote branch 'upstream/master' into motiontemplate ... Conflicts: openslides/motion/models.py openslides/motion/views.py		2013-03-14 21:36:02 +01:00
..
category_form.html	Updated motion category template.	2013-03-11 21:29:56 +01:00
category_list.html	Added category_delete function to template.	2013-03-11 21:50:16 +01:00
config.html	Major changes for new twitter bootstrap template (e.g. replaced icons)	2013-01-31 10:19:56 +01:00
motion_detail.html	Merge remote branch 'upstream/master' into motiontemplate	2013-03-14 21:36:02 +01:00
motion_diff.html	New motion version diff view. Improved version history table in motion detail template.	2013-03-14 21:28:03 +01:00
motion_form.html	Update motion templates to new template design. Added some missing model and view functions.	2013-03-11 18:26:22 +01:00
motion_list.html	Updated motion category template.	2013-03-11 21:29:56 +01:00
poll_form.html	Update motion templates to new template design. Added some missing model and view functions.	2013-03-11 18:26:22 +01:00
widget.html	template: Removed unused 'load staticfiles'.	2013-02-05 21:41:26 +01:00