Skip to content
Commit df5f2ec0 authored by Vit Nakladal's avatar Vit Nakladal
Browse files

Merge branch 'refs/heads/smart-meter-service' 

# Conflicts:
#	openapi.yaml
parents 50ff2b2c c7f5a1d0
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment