Merge branch 'master' into adamierymenko-dev

This commit is contained in:
Adam Ierymenko 2015-07-28 09:40:54 -07:00
commit 1537109514

View File

@ -125,7 +125,7 @@
</object>
<object class="NSMenuItem" id="755159360">
<reference key="NSMenu" ref="110575045"/>
<string key="NSTitle">Hide MacGap</string>
<string key="NSTitle">Hide ZeroTier One</string>
<string key="NSKeyEquiv">h</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>