lfk/frontend
2
0
Fork 0
Code Issues 4 Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'dev' into feature/93-scan_stations

Browse Source 
# Conflicts:
#	src/locales/de.json
This commit is contained in:
Nicolai Ort
2021-03-15 16:55:14 +01:00
parent e296256332 f24b2b9b4c
commit 40ada1c31e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

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