Oskar Hahn bd64a6cb5c Merge branch 'stable/1.2.x' ... Conflicts: openslides/application/models.py openslides/application/views.py openslides/participant/forms.py openslides/participant/views.py		2012-08-13 19:16:42 +02:00
..
base_application.html	changed application to motion and permitted to authorized in message-strings	2012-08-05 22:31:20 +02:00
config.html	fix some typos, mostly {%trans to {% trans	2012-07-16 14:00:29 +02:00
edit.html	changed application to motion and permitted to authorized in message-strings	2012-08-05 22:31:20 +02:00
import.html	changed application to motion and permitted to authorized in message-strings	2012-08-05 22:31:20 +02:00
overview.html	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
poll_view.html	changed application to motion and permitted to authorized in message-strings	2012-08-05 22:31:20 +02:00
view.html	Merge branch 'stable/1.2.x'	2012-08-13 19:16:42 +02:00
widget.html	changed application to motion and permitted to authorized in message-strings	2012-08-05 22:31:20 +02:00