Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools
Conflicts: MoyaAdmin/MoyaAdminUI/MoyaAdminUI.sln MoyaAdmin/MoyaAdminUI/MoyaAdminUI/obj/Debug/MoyaAdminUI.csproj.FileListAbsolute.txt PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.exe PrintServer/moyaPrintServer/moyaPrintServer/bin/Debug/moyaPrintServer.pdb
Showing
with
3982 additions
and
573 deletions
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Card.cs
0 → 100644
MoyaAdmin/MoyaAdminUI/MoyaAdminLib/Reader.cs
0 → 100644
MoyaAdmin/MoyaAdminUI/MoyaAdminUI.v11.suo
0 → 100644
No preview for this file type
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Scanner.cs
0 → 100644
OrgMealCounter/OrgMealCounter.sln
0 → 100644
OrgMealCounter/OrgMealCounter.v11.suo
0 → 100644
No preview for this file type
OrgMealCounter/OrgMealCounter/ApiSettings.cs
0 → 100644
OrgMealCounter/OrgMealCounter/App.config
0 → 100644
OrgMealCounter/OrgMealCounter/Form1.cs
0 → 100644
OrgMealCounter/OrgMealCounter/Form1.resx
0 → 100644
OrgMealCounter/OrgMealCounter/Program.cs
0 → 100644
OrgMealCounter/OrgMealCounter/RestClient.cs
0 → 100644
No preview for this file type
No preview for this file type
No preview for this file type
-
Please register or sign in to post a comment