Merge branch 'master' into interface

This commit is contained in:
meli 2019-12-28 10:23:02 -08:00
commit c618626345
12 changed files with 172 additions and 58 deletions

View file

@ -14,9 +14,9 @@
</PropertyGroup>
<PropertyGroup Label="Feature">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyVersion>4.3.0.0</AssemblyVersion>
<Version>4.3.0.0</Version>
<FileVersion>4.3.0.0</FileVersion>
<AssemblyVersion>4.3.1.0</AssemblyVersion>
<Version>4.3.1.0</Version>
<FileVersion>4.3.1.0</FileVersion>
</PropertyGroup>
<ItemGroup Label="Resources">
<None Include="$(SolutionDir)/Resources/**/*" CopyToOutputDirectory="PreserveNewest" Visible="false" />