diff options
author | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:41:19 +0200 |
---|---|---|
committer | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:41:19 +0200 |
commit | 7e2a2e37e72e649b5eb42362e0469101c7ce19cc (patch) | |
tree | 636944e4ba7bcb13bd18bc3f70391faab8c3ebcc /scripts/util.py | |
parent | 819bb96bd26c1495d6fef2e6477bb96cf147ec22 (diff) | |
parent | dda8ec6f3a46b2dfe9f627c620b7fb57c25d70dc (diff) | |
download | vyos-build-7e2a2e37e72e649b5eb42362e0469101c7ce19cc.tar.gz vyos-build-7e2a2e37e72e649b5eb42362e0469101c7ce19cc.zip |
Merge branch 'current' into crux
Conflicts:
data/kernel_version
scripts/build-config
scripts/defaults.py
scripts/live-build-config
Diffstat (limited to 'scripts/util.py')
0 files changed, 0 insertions, 0 deletions