Skip to content
Snippets Groups Projects
Commit 578e1c58 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'master' into '857-include-correct-vuetify-translations' 

# Conflicts:
#   CHANGELOG.rst
parents a0ef06a1 1a687893
No related branches found
No related tags found
Pipeline #129193 failed
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 83 additions and 33 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment