]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commit
Merge branch 'seventeen-geoip' into next-guardian-geoip
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 5 Mar 2015 18:48:52 +0000 (19:48 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 5 Mar 2015 18:48:52 +0000 (19:48 +0100)
commit153f390ae911e67c8cb39a704fbaf298487b6ee2
tree26d152905df57adbb26d3e52176e607526d861ac
parentf3afb2d38f8f62c443032c4fffa8be63752ab694
parentb9ca2fa60f1ac0127d0bbddb016d0acb578e660d
Merge branch 'seventeen-geoip' into next-guardian-geoip
config/cfgroot/general-functions.pl
config/rootfiles/common/stage2
html/cgi-bin/firewall.cgi
html/cgi-bin/fwhosts.cgi
langs/en/cgi-bin/en.pl
make.sh