808aae597f
Conflicts: CHANGELOG openslides/__init__.py openslides/assignment/views.py |
||
---|---|---|
.. | ||
benchmark | ||
csv-examples | ||
logo | ||
openslides_gui | ||
scripts | ||
win32-portable |
808aae597f
Conflicts: CHANGELOG openslides/__init__.py openslides/assignment/views.py |
||
---|---|---|
.. | ||
benchmark | ||
csv-examples | ||
logo | ||
openslides_gui | ||
scripts | ||
win32-portable |