Merge branch 'master' into 'master' (4eecc321) · Commits · Klaus Merzbach / Frontend · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

F

Frontend
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

4eecc321

Commit 4eecc321 authored 5 years ago by Dennis Eisold

Downloads
- Plain Diff

Merge branch 'master' into 'master'

# Conflicts:
#   Wetterstation/Form1.Designer.cs

parents 26fdf736 c0f56b72

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Wetterstation/Form1.Designer.cs 1 addition, 0 deletions

Wetterstation/Form1.Designer.cs
Wetterstation/Form1.cs 5 additions, 0 deletions

Wetterstation/Form1.cs
Wetterstation/SettingsModel.cs 1 addition, 0 deletions

Wetterstation/SettingsModel.cs
Wetterstation/SqliteDataAccess.cs 1 addition, 0 deletions

Wetterstation/SqliteDataAccess.cs

with 8 additions and 0 deletions

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 sign in to comment