Merge branch 'feature/upgrade-to-winapp11' of https://github.com/open… · openhab/openhab-windows@b4176c6 · GitHub

Commit

Merge branch 'feature/upgrade-to-winapp11' of https://github.com/open…

Browse files

…hab/openhab-windows into feature/upgrade-to-winapp11

Signed-off-by: Christoph Hofmann <[email protected]>

# Conflicts:
#	src/openHAB.Core/Openhab.Core.csproj
#	src/openHAB.Core/Strings/de-de/Resources.resw
#	src/openHAB.Windows/DIService.cs
#	src/openHAB.Windows/ViewModel/MainViewModel.cs

Loading branch information

hoffe86 committed Dec 15, 2024

2 parents 5999259 + 32f19f2 commit b4176c6