Merge branch 'master' of gitlab.codecrew.fi:liv/moya-info-tools
Conflicts: PrintServer/moyaPrintServer/moyaPrintServer/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache PrintServer/moyaPrintServer/moyaPrintServer/obj/x86/Debug/moyaPrintServer.csproj.FileListAbsolute.txt
Showing
with
2066 additions
and
96 deletions
No preview for this file type
No preview for this file type
CardDisplay/CardDisplay/CardDisplay.v11.suo
0 → 100644
No preview for this file type
CardDisplay/CardDisplay/CardDisplay/Card.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
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