2 commits

Author	SHA1	Message	Date
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
Adam Ierymenko	eef70e198b	Version 2.x notice updates and other boring stuff.	2020-01-20 08:46:20 -08:00