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
..
2019-12-11 16:43:07 +01:00
2020-09-18 15:59:03 +02:00
2016-06-27 01:45:38 +02:00
2020-09-23 22:10:52 +02:00
2016-06-27 01:45:38 +02:00
2018-02-19 10:52:48 +01:00
2016-06-27 01:45:38 +02:00
2020-09-30 12:07:08 +02:00
2016-06-27 01:45:38 +02:00
2019-02-28 12:38:29 +01:00
2016-06-27 01:45:38 +02:00
2016-06-27 01:45:38 +02:00
2019-10-10 22:07:42 +02:00
2016-06-27 01:45:38 +02:00
2017-03-28 11:01:28 +02:00
2016-06-27 01:45:38 +02:00
2016-06-27 01:45:38 +02:00
2016-06-27 01:45:38 +02:00
2016-06-27 01:45:38 +02:00
2016-06-27 01:45:38 +02:00
2020-09-23 22:10:52 +02:00
2018-01-02 18:47:59 -04:00