Merge branch 'captive-portal' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Oct 2017 15:10:07 +0000 (16:10 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Oct 2017 15:10:07 +0000 (16:10 +0100)
commit027614d2dc3107a4e071e8dac49ce8a74c36e4ea
treebd27513225b47a0fd058ded883e8497e20ffc6a0
parente2d934cf2bbc9409e878b719a6688476ab9b6874
parent0a219160ac7dfe243c94c1f04c182d29206df8ec
Merge branch 'captive-portal' into next
config/rootfiles/common/apache2
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/apache2
make.sh