Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Oct 2018 10:51:44 +0000 (10:51 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Oct 2018 10:51:44 +0000 (10:51 +0000)
1  2 
config/rootfiles/core/125/filelists/files

@@@ -3,5 -3,7 +3,8 @@@ etc/issu
  etc/ssh/sshd_config
  etc/sysctl.conf
  srv/web/ipfire/cgi-bin/credits.cgi
+ srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
+ srv/web/ipfire/cgi-bin/media.cgi
 +srv/web/ipfire/cgi-bin/pakfire.cgi
+ usr/local/bin/makegraphs
  var/ipfire/langs