rene
ccad6ad68c
Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
# Conflicts:
# BeWo/ServiceProxy/Generated.cs
# BeWo/View/Master/ReportView.xaml.cs
# BeWo/View/Report/Employee/EmployeeHourReportView.xaml
# Data/Data.csproj
# Report/AbstractReportCreator.cs
# Report/DefaultReportCreator.cs
# Report/Report.csproj
# Service/DCEntityMapper/MapperFactory.cs
# Service/Service.csproj
# Service/ServiceContracts/IOperationsService.cs
# Service/ServiceImplementations/OperationsServiceImp.cs
# Shared/BeWoEntityEnums.cs
# Shared/DataContracts/ReportTypes.cs
# Shared/Shared.csproj
2020-09-30 12:07:08 +02:00
..
2020-09-23 22:10:52 +02:00
2020-09-30 12:07:08 +02:00
2020-09-30 12:07:08 +02:00
2016-06-27 01:45:38 +02:00
2020-08-17 15:50:00 +02:00
2020-02-06 18:56:40 +01:00
2020-05-27 18:15:54 +02:00
2017-12-15 10:47:43 +01:00
2020-09-30 12:07:08 +02:00
2020-04-08 15:54:20 +02:00
2016-11-25 11:23:44 +01:00
2020-09-30 12:07:08 +02:00
2016-06-27 01:45:38 +02:00