From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 22 May 2025 15:18:45 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89bd70bc4054d3c53148374f86e9812e90a26a5a;p=ipfire-2.x.git

Merge branch 'master' into next
---

89bd70bc4054d3c53148374f86e9812e90a26a5a
diff --cc config/rootfiles/oldcore/195/filelists/ntp
index 0000000000,7542d86cb0..7542d86cb0
mode 000000,120000..120000
--- a/config/rootfiles/oldcore/195/filelists/ntp
+++ b/config/rootfiles/oldcore/195/filelists/ntp