]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/next'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Oct 2020 11:46:16 +0000 (11:46 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 27 Oct 2020 11:46:16 +0000 (11:46 +0000)
1  2 
config/rootfiles/core/152/exclude
config/rootfiles/core/152/filelists/libloc

Simple merge
index ff4a92429cb2937f76a27003ed1fe1ee80479bbc,0000000000000000000000000000000000000000..ff4a92429cb2937f76a27003ed1fe1ee80479bbc
mode 120000,000000..120000
--- /dev/null