github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-05 20:41:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into zeroidc

Browse source 
# Conflicts:
#	.gitignore
This commit is contained in:
Grant Limberg 2021-11-11 16:20:43 -08:00
commit b5186f7293
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
11 changed files with 129 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.gitignore vendored
View file

@ -124,3 +124,16 @@ workspace/
workspace2/
zeroidc/target/
tmp/
#snapcraft specifics
/parts/
/stage/
/prime/
*.snap
.snapcraft
__pycache__
*.pyc
*_source.tar.bz2
snap/.snapcraft