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

# Conflicts:
#	BeWo/SchulbegleitenderDienst/NewSchulbegleitenderDienstView.xaml
#	BeWo/ServiceProxy/Generated.cs
#	BeWo/View/Detail/ServiceRecordView2.xaml.cs
#	BeWo/ViewModel/VertretungVM.cs
#	Data/Entities/Vertretung.cs
#	ReportImp/HphBersenbrueckAtz/HphBersenbrueckAtz.csproj
#	Service/DCEntityMapper/VertretungDC_Vertretung.cs
#	Service/Plugins/PluginLoader.cs
#	Service/ServiceContracts/IOperationsService.cs
#	Service/ServiceImplementations/OperationsServiceImp.cs
#	Shared/DataContracts/VertretungDC.cs

2017-04-26 13:52:04 +02:00

..

Configuration

Schwellwert einstellung unter verwaltung

2017-03-22 13:38:09 +01:00

Core

devexpress 13.1->13.2

2017-04-03 13:07:06 +02:00

DCEntityMapper

Schulbegleitender Dienst

2017-04-07 13:44:07 +02:00

Exceptions

moved from SVN to git

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

Invoicing

Dies und das

2017-02-18 16:16:19 +01:00

MessageContracts

Neue Dateien

2017-03-24 10:35:48 +01:00

Multitenancy

moved from SVN to git

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

Plugins

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

2017-04-26 13:52:04 +02:00

Properties

moved from SVN to git

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

Reporting

Merge alte Version

2017-02-01 13:53:59 +01:00

Security

moved from SVN to git

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

ServiceContracts

Schulbegleitender Dienst

2017-04-07 13:44:07 +02:00

ServiceImplementations

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

2017-04-26 13:52:04 +02:00

UnitOfWork

moved from SVN to git

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

app.config

moved from SVN to git

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

packages.config

moved from SVN to git

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

Service.csproj

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

2017-04-26 13:52:04 +02:00

Service.csproj.user

moved from SVN to git

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