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

# Conflicts:
#	BeWo/View/Detail/Report/ServicesReportViewAlt.xaml
#	BeWo/View/Detail/Report/ServicesReportViewAlt.xaml.cs
#	Service/Plugins/PluginLoader.cs
This commit is contained in:
Christian
2020-10-27 13:49:12 +01:00
354 changed files with 13608 additions and 2491 deletions

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BellaDonna</RootNamespace>
<AssemblyName>1601313225_Reports</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>