Merge branch 'master' into cmake

This commit is contained in:
Grant Limberg 2019-08-01 13:49:30 -07:00
commit c2f9aab068
86 changed files with 4809 additions and 5863 deletions

View file

@ -19,9 +19,9 @@
<Run Text="ZeroTier One"/>
</Paragraph>
<Paragraph TextAlignment="Center">
<Run FontSize="14" Text="Version 1.2.12"/>
<Run FontSize="14" Text="Version 1.4.0"/>
<LineBreak/>
<Run FontSize="14" Text="(c) 2011-2018 ZeroTier, Inc."/>
<Run FontSize="14" Text="(c) 2011-2019 ZeroTier, Inc."/>
<LineBreak/>
<Run FontSize="14" Text="www.zerotier.com"/>
</Paragraph>