summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-12-04 17:13:59 +0100
committerChristian Poessinger <christian@poessinger.com>2019-12-04 17:13:59 +0100
commita96ffc33cc63918ba3815f66c506c717a8676621 (patch)
treef883f5976a40f2066f500363931a5e499374b8de /Makefile
parent26677aa3ce312a5b980ea88d57feebd09e39fd98 (diff)
parentaceb4d7e187a571019e4bc24cd23efc7c2f624fe (diff)
downloadvyos-1x-a96ffc33cc63918ba3815f66c506c717a8676621.tar.gz
vyos-1x-a96ffc33cc63918ba3815f66c506c717a8676621.zip
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x: shutdown: T1826: Modify cancel reboot msg T1801: move escaping of backslashes into configtree vxlan: T1636: remove unused import statements geneve: T1799: remove unused import statements
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions