Rene Evertz
af4e753071
not complete - folder empty
Merge branch 'master' into BewoRene_feature_Launcher
# Conflicts:
# BeWo/BeWoApp.xaml.cs
# BeWo/Loader.cs
# BeWo/app.config
# BeWoLauncher/App.config
# BeWoLauncher/BeWoLauncher.csproj
# BeWoLauncher/Logic/Behavior/LaunchBehavior.cs
# BeWoLauncher/View/Frames/InfoFrame.xaml
# BeWoLauncher/View/Frames/InstallInfoFrame.xaml.cs
# BeWoOhneReports.sln
# DownloadServer/Multitenancy/demo.config
# DownloadServer/Web.config
# ReportImp/AlphaEv/Properties/Resources.resx
# ReportImp/Inkomm/Properties/Resources.Designer.cs
# Service/Multitenancy/DMultitenancyEndpointBehavior.cs
# Service/Multitenancy/DMultitenancyHeader.cs
# Service/Multitenancy/DMultitenancyInterceptor.cs
# Service/ServiceImplementations/DownloadBeWoServiceImp.cs
# Service/ServiceImplementations/LauncherServiceImp.cs
# Service/ServiceUtils/Paths/ServerFilePaths.cs
# Service/ServiceUtils/Update/UpdateConfigReader.cs
# Service/ServiceUtils/Update/UpdateFileResponseBuilder.cs
# Service/ServiceUtils/Update/UpdatePlanResponseBuilder.cs
# SharedLauncher/DataContract/UpdatePlanResponse.cs
# SharedLauncher/Information/SessionInformation.cs
2024-05-22 13:16:32 +02:00
..
2023-03-24 15:53:34 +01:00
2024-05-21 10:28:08 +02:00
2024-05-21 16:05:49 +02:00
2023-06-22 09:35:51 +02:00