Merge branch 'master' of github.com:OpenSlides/OpenSlides
This commit is contained in:
commit
56510f94a8
@ -5,7 +5,7 @@
|
||||
:license: GNU GPL, see LICENSE for more details.
|
||||
"""
|
||||
|
||||
VERSION = (1, 4, 0, 'alpha', 0) # During development it is the next release
|
||||
VERSION = (1, 4, 0, 'alpha', 1) # During development it is the next release
|
||||
RELEASE = False
|
||||
|
||||
|
||||
|
@ -180,13 +180,13 @@
|
||||
<a href="{% url 'motion_set_status' motion.id 'adj' %}"><span class="button">{% trans 'Adjourned' %}</span></a><br>
|
||||
{% endif %}
|
||||
{% if "noc" in actions %}
|
||||
<a href="{% url 'motion_set_status' motion.id 'noc' %}'><span class="button">{% trans 'Not Concerned' %}</span></a><br>
|
||||
<a href="{% url 'motion_set_status' motion.id 'noc' %}"><span class="button">{% trans 'Not Concerned' %}</span></a><br>
|
||||
{% endif %}
|
||||
{% if "com" in actions %}
|
||||
<a href="{% url 'motion_set_status' motion.id 'com' %}'><span class="button">{% trans 'Commited a bill' %}</span></a><br>
|
||||
<a href="{% url 'motion_set_status' motion.id 'com' %}"><span class="button">{% trans 'Commited a bill' %}</span></a><br>
|
||||
{% endif %}
|
||||
{% if "wit" in actions %}
|
||||
<a href="{% url 'motion_set_status' motion.id 'wit' %}'><span class="button">{% trans 'Withdrawed by submitter' %}</span></a>
|
||||
<a href="{% url 'motion_set_status' motion.id 'wit' %}"><span class="button">{% trans 'Withdrawed by submitter' %}</span></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<p></p>
|
||||
|
Loading…
Reference in New Issue
Block a user