Merge branch 'master' into '811-fix-displaying-of-messages-in-vue-frontend'
# Conflicts: # CHANGELOG.rst
Showing
- CHANGELOG.rst 2 additions, 1 deletionCHANGELOG.rst
- aleksis/core/frontend/messages/de.json 29 additions, 3 deletionsaleksis/core/frontend/messages/de.json
- aleksis/core/frontend/messages/ru.json 206 additions, 0 deletionsaleksis/core/frontend/messages/ru.json
- aleksis/core/frontend/messages/uk.json 42 additions, 16 deletionsaleksis/core/frontend/messages/uk.json
- aleksis/core/locale/uk/LC_MESSAGES/django.po 23 additions, 92 deletionsaleksis/core/locale/uk/LC_MESSAGES/django.po
- aleksis/core/templates/core/data_check/list.html 4 additions, 1 deletionaleksis/core/templates/core/data_check/list.html
- aleksis/core/templatetags/html_helpers.py 19 additions, 0 deletionsaleksis/core/templatetags/html_helpers.py
Loading
Please register or sign in to comment