Skip to content
Snippets Groups Projects
Commit 706420f5 authored by Roger Petri's avatar Roger Petri
Browse files

Merge branch 'master' of https://www.gitrepo.de/wetterstation/frontend 

# Conflicts:
#	Wetterstation/Form1.cs
#	Wetterstation/Settings.cs
parents e1ed420d 887a6c6c
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 328 additions and 216 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