Grant Limberg a0efea8e0f Merge branch 'dev' into edge ... # Conflicts: # .gitignore # Jenkinsfile # attic/macui/ZeroTier One.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist # attic/service/OneService.cpp		2020-02-03 13:54:49 -08:00
..
project.xcworkspace	Merge branch 'dev' into edge	2020-02-03 13:54:49 -08:00
project.pbxproj	Version 2.x notice updates and other boring stuff.	2020-01-20 08:46:20 -08:00