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

..

debug.config

moved from SVN to git

2016-06-27 01:45:38 +02:00

debugMsSQL.config

moved from SVN to git

2016-06-27 01:45:38 +02:00

debugMySQL.config

moved from SVN to git

2016-06-27 01:45:38 +02:00

demo.config

Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo

2020-09-30 12:07:08 +02:00

Symbol Edit.png

moved from SVN to git

2016-06-27 01:45:38 +02:00