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

..

Core

Diverses

2017-04-25 18:07:24 +02:00

DataContracts

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

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

Extensions

moved from SVN to git

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

Properties

moved from SVN to git

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

Rss

moved from SVN to git

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

Services

cb

2017-02-10 11:08:38 +01:00

Settings

moved from SVN to git

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

BeWoEntityEnums.cs

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

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

packages.config

moved from SVN to git

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

Packet.cs

Packet Buffer auf 30MB gesetzt

2016-11-25 11:23:44 +01:00

Shared.csproj

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

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

Shared.csproj.user

moved from SVN to git

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