summaryrefslogtreecommitdiff
path: root/.merge-branch-exclude
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2014-09-25 16:28:49 +0200
committerDaniil Baturin <daniil@baturin.org>2014-09-25 16:28:49 +0200
commitb9a8dfa4b7f248e42532d047eedc06a8c98e2ce9 (patch)
treee214577a5828af5160138451400bc2833c7322a4 /.merge-branch-exclude
parentde8a3de7f6f8faa27dc7f56ff09cab1d0b656c2d (diff)
parent92427eed1488b82253f18611c54868a29ca48c2b (diff)
downloadvyatta-cfg-system-b9a8dfa4b7f248e42532d047eedc06a8c98e2ce9.tar.gz
vyatta-cfg-system-b9a8dfa4b7f248e42532d047eedc06a8c98e2ce9.zip
Merge branch 'helium' of github.com:vyos/vyatta-cfg-system into helium
Diffstat (limited to '.merge-branch-exclude')
0 files changed, 0 insertions, 0 deletions