Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-04-30 15:43:06 -07:00
commit a2a03b896b
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
1 changed files with 1 additions and 1 deletions

View File

@ -11,7 +11,7 @@
<!-- VS for Mac does not like letters in package versions -->
<AddinBuildNumber Condition="'$(BuildNumber)' == 't000'">99999</AddinBuildNumber>
<AddinBuildNumber Condition="'$(AddinBuildNumber)' == ''">$(BuildNumber)</AddinBuildNumber>
<!-- Properties for VS for Mac addin -->
<!--