diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-07 11:24:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-07 11:24:51 +0200 |
| commit | 8cc6bd529c76c2958999dcc379c418d748181731 (patch) | |
| tree | eba1fc570ee7bbf8f32c257c0289f6cc59d991be /data/templates | |
| parent | 09ad28b28c9ebd9308cfe9048686b3b0ef9cfd9c (diff) | |
| parent | f52c3b345be8e5aa1af8bdebcc70c852bb320568 (diff) | |
| download | vyos-1x-8cc6bd529c76c2958999dcc379c418d748181731.tar.gz vyos-1x-8cc6bd529c76c2958999dcc379c418d748181731.zip | |
Merge pull request #308 from thomas-mangin/T2226-merge
util: T2226: fix merge conflict
Diffstat (limited to 'data/templates')
0 files changed, 0 insertions, 0 deletions