|
|
375ba4b36b
|
Merge branch 'master' into feature_rene_17_xrechnung
# Conflicts:
# .gitignore
# BeWo/DebugConfig.cs
# BeWo/ServiceProxy/Generated.cs
# Data/ASPHibernateSessionManager.cs
# Host/Web.config
# Service/Service.csproj
# Service/ServiceContracts/IAccountingService.cs
# Service/ServiceImplementations/AccountingServiceImp.cs
# Shared/Core/Utils.cs
# Shared/DataContracts/InvoiceBaseDC.cs
# Shared/Shared.csproj
|
2025-05-26 13:05:25 +02:00 |
|