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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: b749416 f6326e4)

author	Stefan Schantl <stefan.schantl@ipfire.org>
	Mon, 21 Jan 2019 12:04:13 +0000 (13:04 +0100)
committer	Stefan Schantl <stefan.schantl@ipfire.org>
	Mon, 21 Jan 2019 12:04:13 +0000 (13:04 +0100)
commit	c1a34012352f9eee339f78c00130807e275b05c2
tree	b5f95a1729c03b6dbbad100ed610d2a9255cd72a	tree \| snapshot
parent	b749416ad71126d6a05eb92b1409f097cc127617	commit \| diff
parent	f6326e4f777519e857d740cc525bb1ae3ea57ee3	commit \| diff

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-suricata

14 files changed:

config/backup/include	diff1 \|	diff2 \|	blob \| history
config/cfgroot/general-functions.pl	diff1 \|	diff2 \|	blob \| history
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
html/cgi-bin/ids.cgi	diff1 \|	diff2 \|	blob \| history
html/cgi-bin/logs.cgi/log.dat	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
lfs/initscripts	diff1 \|	diff2 \|	blob \| history
make.sh	diff1 \|	diff2 \|	blob \| history

Peter's tree of IPFire 2.x