From: Michael Tremer Date: Tue, 8 Jun 2021 14:10:22 +0000 (+0000) Subject: Merge branch 'master' into next X-Git-Tag: v2.25-core158~33^2~49 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=52c84741cf97a4fdb30da0e27509e7fd353f66c9;p=ipfire-2.x.git Merge branch 'master' into next --- 52c84741cf97a4fdb30da0e27509e7fd353f66c9 diff --cc config/rootfiles/core/158/filelists/python3-inotify index 0000000000,d2515bcba0..d2515bcba0 mode 000000,120000..120000 --- a/config/rootfiles/core/158/filelists/python3-inotify +++ b/config/rootfiles/core/158/filelists/python3-inotify