summaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2018-10-28 20:10:25 +0100
committerDaniil Baturin <daniil@baturin.org>2018-10-28 20:10:25 +0100
commit0ea64f7c139685066663117aa30c52fb9aeb5680 (patch)
treec43f97eb78b317a4aae31c6764099aa524b664f8 /COPYING
parentadf0dac4bc7a42303d49e2ed03ac9d0d888a157e (diff)
parent92c15a6c1268eb28738899d85568d051124f8f51 (diff)
downloadvyatta-op-0ea64f7c139685066663117aa30c52fb9aeb5680.tar.gz
vyatta-op-0ea64f7c139685066663117aa30c52fb9aeb5680.zip
Merge branch 'current' into crux
Conflicts: debian/changelog
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions