Skip to content
Commit fa3ee6c5 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'develop' into 'install-strings'

# Conflicts:
#   server/scripts/update_from_dev_stable.sh
parents 89aab777 82f6e7b1
Loading
Loading
Loading
Pipeline #4783 passed with stage
in 8 minutes and 20 seconds
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment