Christian
fb8da8daa7
Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
# BeWo/ServiceProxy/Generated.cs
# BeWo/View/Detail/SupportConceptGoalRatingView.xaml.cs
# BeWo/View/Search/SupportConceptGroupSearchView.cs
# BeWo/ownChat/ChatServiceCustomer.xaml.cs
# BeWo/ownChat/ChatServiceEmployee.xaml.cs
# ReportImp/ChristianLuft/ServiceInvoiceReport.Designer.cs
# Service/Plugins/PluginLoader.cs
# Service/ServiceContracts/IEmployeeService.cs
2021-09-07 16:16:16 +02:00
..
2016-06-27 01:45:38 +02:00
2021-09-07 16:16:16 +02:00
2016-06-27 01:45:38 +02:00
2020-09-30 10:00:31 +02:00
2016-06-27 01:45:38 +02:00