void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-07-24 03:02:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
5370 commits 16 branches 105 tags 186 MiB
Commit graph

3 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
50009fef6f
Merge branch 'dev' into edge 2019-09-16 20:26:41 -07:00
Grant Limberg
cb4ebfdbd2 Dragging adam into CMake kicking and screaming :) 2019-08-16 10:45:14 -07:00
Renamed from make-mac.mk (Browse further)