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

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

projects / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 45f4de2 9625378)

author	Stefan Schantl <stefan.schantl@ipfire.org>
	Fri, 3 Jul 2020 16:48:30 +0000 (18:48 +0200)
committer	Stefan Schantl <stefan.schantl@ipfire.org>
	Fri, 3 Jul 2020 16:48:30 +0000 (18:48 +0200)
commit	af7f9fc43d84cdce163a699992d8cf3ff74817dc
tree	1eae9d3bac9d2f52a25c330eedc86b42cb231da4	tree \| snapshot
parent	45f4de2bbcafb689b21a201c0aa836881ce417c2	commit \| diff
parent	96253783d49c51e953e8d10fb24b2486226ed75e	commit \| diff

:xMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch-to-libloc

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

17 files changed:

config/rootfiles/common/aarch64/initscripts	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/armv5tel/initscripts	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/configroot	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/i586/initscripts	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/x86_64/initscripts	diff1 \|	diff2 \|	blob \| history
doc/language_issues.en	diff1 \|	diff2 \|	blob \| history
doc/language_issues.es	diff1 \|	diff2 \|	blob \| history
doc/language_issues.it	diff1 \|	diff2 \|	blob \| history
doc/language_issues.nl	diff1 \|	diff2 \|	blob \| history
doc/language_issues.pl	diff1 \|	diff2 \|	blob \| history
doc/language_issues.ru	diff1 \|	diff2 \|	blob \| history
html/cgi-bin/credits.cgi	diff1 \|	diff2 \|	blob \| history
langs/de/cgi-bin/de.pl	diff1 \|	diff2 \|	blob \| history
langs/en/cgi-bin/en.pl	diff1 \|	diff2 \|	blob \| history
lfs/configroot	diff1 \|	diff2 \|	blob \| history
make.sh	diff1 \|	diff2 \|	blob \| history
src/initscripts/system/firewall	diff1 \|	diff2 \|	blob \| history

IPFire 2.x development tree