Merge branch 'dev' into edge

This commit is contained in:
Adam Ierymenko 2018-04-30 08:47:51 -07:00
commit 381bbb0e5e
15 changed files with 29 additions and 12 deletions

View file

@ -19,7 +19,7 @@
<Run Text="ZeroTier One"/>
</Paragraph>
<Paragraph TextAlignment="Center">
<Run FontSize="14" Text="Version 1.2.6"/>
<Run FontSize="14" Text="Version 1.2.8"/>
<LineBreak/>
<Run FontSize="14" Text="(c) 2011-2017 ZeroTier, Inc."/>
<LineBreak/>