Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools
Conflicts: BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/bin/Debug/BarcodeScannerClient.exe BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/bin/Debug/BarcodeScannerClient.pdb BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.csproj.FileListAbsolute.txt BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.csprojResolveAssemblyReference.cache BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.exe BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/BarcodeScannerClient.pdb BarcodeScannerClient/BarcodeScannerClient/BarcodeScannerClient/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
Showing
with
5641 additions
and
26 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
MoyaAdmin/MoyaAdminUI/MoyaAdminUI.sln
0 → 100644
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Map.cs
0 → 100644
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/Program.cs
0 → 100644
MoyaAdmin/MoyaAdminUI/MoyaAdminUI/User.cs
0 → 100644
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
File mode changed
File mode changed
File mode changed
MoyaAdmin/MoyaAdminUI/autopublish.xml
0 → 100644
MoyaAdmin/MoyaAdminUI/autoupdate.crt
0 → 100644
MoyaAdmin/MoyaAdminUI/base.nsi
0 → 100644
MoyaAdmin/MoyaAdminUI/out_moya.nsi
0 → 100644
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
No preview for this file type
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