Merge branch 'dev' into feature/93-scan_stations

# Conflicts:
#	src/locales/de.json
This commit is contained in:
Nicolai Ort 2021-03-15 16:55:14 +01:00
commit 40ada1c31e

View File

@ -54,7 +54,7 @@ steps:
tags:
- dev
registry: registry.odit.services
mtu: 1000
trigger:
branch:
- dev