summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2022-04-04 13:32:53 +0200
committerGitHub <noreply@github.com>2022-04-04 13:32:53 +0200
commit1678ecdc7bff0ac89b8dfd6608097156f92b9f3a (patch)
tree851e4597f3581ff27b4a53092bd85e5089948bcf /data
parentadda3d86080bb3b8fe26424c7d829e40eb9e2b23 (diff)
parent035bc9588d319ef8db434fb06caaad2df8eb2a19 (diff)
downloadvyos-1x-1678ecdc7bff0ac89b8dfd6608097156f92b9f3a.tar.gz
vyos-1x-1678ecdc7bff0ac89b8dfd6608097156f92b9f3a.zip
Merge pull request #1266 from c-po/pr-conflict-backport
GitHub: enable PR conflict workflow - backport from current
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions