From: Arne Fitzenreiter Date: Sat, 19 Jan 2019 18:58:48 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b86a7ec28bd2a2049e771b59dff817c0569e106;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'origin/master' into next --- 9b86a7ec28bd2a2049e771b59dff817c0569e106 diff --cc config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel index 0000000000,6a00446f4d..6a00446f4d mode 000000,100644..100644 --- a/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel +++ b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel diff --cc config/rootfiles/oldcore/127/filelists/bind index 0000000000,48a0ebaefd..48a0ebaefd mode 000000,120000..120000 --- a/config/rootfiles/oldcore/127/filelists/bind +++ b/config/rootfiles/oldcore/127/filelists/bind