ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
Christian
2017-04-26 13:52:04 +02:00
parent ad42184e6b 2e30cb1fe3
commit 8afc248626
73 changed files with 7056 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Service/Service.csproj
View File

@@ -214,6 +214,8 @@
<Compile Include="DCEntityMapper\EmployeeAPPCodeDC_EmployeeAPPCode.cs" />
<Compile Include="DCEntityMapper\ChatMessageDC_ChatMessage.cs" />
<Compile Include="DCEntityMapper\ChatMediaMessageDC_ChatMediaMessage.cs" />
<Compile Include="DCEntityMapper\VertretungsListeDC_VertretungsListe.cs" />
<Compile Include="DCEntityMapper\KriterienDC_Kriterien.cs" />
<Compile Include="DCEntityMapper\PasswortVerlaufDC_PasswortVerlauf.cs" />
<Compile Include="DCEntityMapper\MedRecordDC_MedRecord.cs" />
<Compile Include="DCEntityMapper\SignatureDC_Signature.cs" />