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

This commit is contained in:
Michael Tremer
2016-04-08 16:16:57 +01:00
4 changed files with 32 additions and 43 deletions

View File

@@ -1,2 +1,5 @@
etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/chpasswd.cgi
srv/web/ipfire/cgi-bin/ipinfo.cgi
srv/web/ipfire/cgi-bin/proxy.cgi