git.ipfire.org Git - people/stevee/ipfire-2.x.git/commit

]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commit

projects / people / stevee / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e769050 99a79bc)

author	Stefan Schantl <stefan.schantl@ipfire.org>
	Sat, 7 May 2022 09:44:48 +0000 (11:44 +0200)
committer	Stefan Schantl <stefan.schantl@ipfire.org>
	Sat, 7 May 2022 09:44:48 +0000 (11:44 +0200)
commit	7d4d67b07e99a5b5ee29c36c42c805886a758094
tree	ce6a104c8357af3fb1fec3767fa55c593bc9ef95	tree
parent	e7690506ec02e63eb36be02e3275578b607f802a	commit \| diff
parent	99a79bcbd89de07e108b836fe7d19bd26aeb02c3	commit \| diff

Merge branch 'next' into ipblocklist-rbsed-c168

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

config/backup/include	diff1 \|	diff2 \|	blob \| history
config/cron/crontab	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/aarch64/stage2	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/armv6l/stage2	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/x86_64/stage2	diff1 \|	diff2 \|	blob \| history
langs/en/cgi-bin/en.pl	diff1 \|	diff2 \|	blob \| history
lfs/configroot	diff1 \|	diff2 \|	blob \| history
lfs/stage2	diff1 \|	diff2 \|	blob \| history
make.sh	diff1 \|	diff2 \|	blob \| history

Stefan's tree of IPFire 2.x.