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)
1  2 
config/rootfiles/common/apache2
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
lfs/apache2
make.sh

Simple merge
Simple merge
Simple merge
diff --cc lfs/apache2
Simple merge
diff --cc make.sh
Simple merge