Merge branch 'feature_rene_18_ai' # Conflicts: # BeWo/BeWo.csproj # BeWo/BeWoApp.xaml.cs # BeWo/ServiceProxy/GeneratedCustomerService.cs # BeWo/ServiceProxy/GeneratedEmployeeService.cs # BeWo/ServiceProxy/GeneratedOperationsService.cs # BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs # BeWo/View/Detail/EmployeeView.xaml # BeWo/app.config # BeWoAllReports.sln # BeWoPlanerMobil.sln # Data/Access/SearchDAO.cs # Data/Data.csproj # Data/Security/UserRightHelper.cs # Server/Components/AICore/Prompt/SystemPrompts/Examples/TranscriptionService.cs # Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs # Service/ServiceImplementations/EmployeeServiceImp.cs # Shared/BeWoEntityEnums.cs # Shared/Core/EnumTranslations.cs # Shared/Core/GkvValidator.cs # Shared/Core/ValidatorExtended.cs # Shared/Shared.csproj
3.0 KiB
3.0 KiB