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: 11b4680 1e2c442)

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 13 Nov 2020 18:20:59 +0000 (18:20 +0000)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 13 Nov 2020 18:21:20 +0000 (18:21 +0000)
commit	a832b5c2e6f96bef108457d36945ea5d5fa961b3
tree	ef5b10e50899ebd9e24cfd28b88bd713d30f0c61	tree \| snapshot
parent	11b46800a5391ca9cffdec29e4c61a0bd32ab419	commit \| diff
parent	1e2c442c9e2d11590af214bdddde5cf0506e0a52	commit \| diff

Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

config/rootfiles/core/153/exclude	diff1 \|	diff2 \|	blob \| history
config/rootfiles/core/153/filelists/libloc	\|	diff2 \|	blob \| history
config/rootfiles/oldcore/152/filelists/files	diff1 \|	diff2 \|	blob \| history
lfs/samba	diff1 \|	diff2 \|	blob \| history

IPFire 2.x development tree