From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 29 Oct 2018 10:51:44 +0000 (+0000)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.21-core125~40
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=02776a0dc27051337ecaf0212a740c642b337378;hp=-c

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

02776a0dc27051337ecaf0212a740c642b337378
diff --combined config/rootfiles/core/125/filelists/files
index 26ac36080a,47c0e77f3b..f2afb62fbf
--- a/config/rootfiles/core/125/filelists/files
+++ b/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