summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-10-28 19:36:21 +0100
committerDaniil Baturin <daniil@baturin.org>2018-10-28 19:36:21 +0100
commit556357b9cd970c1b6ba3fc5fd3d34c35e057f0dc (patch)
tree617c5d70f6f84dafee412e7f44059f8a265187d1 /README
parent477396a0e1069f8876ec069ec01edb8523548cf6 (diff)
parent7cad0a47a07c5b32e1b547e6b293a1f96daf39ba (diff)
downloadvyatta-cfg-556357b9cd970c1b6ba3fc5fd3d34c35e057f0dc.tar.gz
vyatta-cfg-556357b9cd970c1b6ba3fc5fd3d34c35e057f0dc.zip
Merge branch 'current' into crux
Conflicts: debian/vyatta-cfg.vyatta-router.service
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions