Merge branch 'dev' into edge

This commit is contained in:
Adam Ierymenko 2018-04-30 08:47:51 -07:00
commit 381bbb0e5e
15 changed files with 29 additions and 12 deletions

View file

@ -358,6 +358,9 @@ uninstall: FORCE
debian: FORCE
debuild -I -i -us -uc -nc -b
debian-clean: FORCE
rm -rf debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one
redhat: FORCE
rpmbuild -ba zerotier-one.spec