|
|
e2f72fbea0
|
Merge branch 'master' into feature_rene_17_xrechnung
# Conflicts:
# BeWo/ServiceProxy/Generated.cs
# BeWo/Services/BeWoWindowService.cs
# BeWo/View/Controls/GkvAbrechnungDetailControl.xaml.cs
# BeWo/View/Windows/BeWoWindowBuilder.cs
# Data/Data.csproj
# Host/ServiceRecordPage.aspx.cs
# Service/Core/ServiceHelper.cs
# Service/Security/SecurityContextInitializer.cs
# Service/ServiceBehavior/AdminMultitenancyContextInitializer.cs
|
2025-06-17 13:07:41 +02:00 |
|