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

This commit is contained in:
Arne Fitzenreiter
2013-10-06 17:06:28 +02:00
5 changed files with 819 additions and 305 deletions

View File

@@ -5,6 +5,7 @@ srv/web/ipfire/cgi-bin/connections.cgi
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/ipfire/include/style.css