]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e2c8f4 975a11b)
Merge branch 'central-ipset' into ipblocklist
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 5 Mar 2022 18:32:41 +0000 (19:32 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 5 Mar 2022 18:32:41 +0000 (19:32 +0100)
1  2 
config/rootfiles/core/165/exclude patch | diff1 | diff2 | blob | history

diff --cc config/rootfiles/core/165/exclude
Simple merge
Stefan's tree of IPFire 2.x.