summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-10-28 23:17:50 +0100
committerDaniil Baturin <daniil@baturin.org>2018-10-28 23:17:50 +0100
commitc084316669ff70f34fef3a2e054982693d539edd (patch)
tree6645c635ae3da2d39a558b3116268a067ed2d236 /docs
parentd8c4adcaeb1315195b99e2f59840d856a60608be (diff)
parent4d16dbead89c44aca5bcc91981a98572b9c15f16 (diff)
downloadvyos-build-c084316669ff70f34fef3a2e054982693d539edd.tar.gz
vyos-build-c084316669ff70f34fef3a2e054982693d539edd.zip
Merge branch 'current' into crux
Conflicts: data/live-build-config/package-lists/vyos-utils.list.chroot scripts/live-build-config
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions