Christian b9a99f9826 Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo ...

# Conflicts:
#	BeWo/BeWoApp.xaml.cs
#	BeWo/ServiceProxy/Generated.cs

2017-02-10 12:26:35 +01:00

..

AppSettings.cs

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

2017-02-10 12:26:35 +01:00