From: Michael Tremer Date: Tue, 24 Sep 2024 08:54:50 +0000 (+0000) Subject: Merge branch 'master' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ca5fb74ab9aa8343af4393e0382217884d136e5;p=people%2Fms%2Fipfire-2.x.git Merge branch 'master' into next --- 6ca5fb74ab9aa8343af4393e0382217884d136e5 diff --cc config/rootfiles/oldcore/189/filelists/curl index 0000000000,0000000000..4b84bef53a new file mode 120000 --- /dev/null +++ b/config/rootfiles/oldcore/189/filelists/curl @@@ -1,0 -1,0 +1,1 @@@ ++../../../common/curl diff --cc config/rootfiles/oldcore/189/filelists/dtc index 0000000000,f2e3891c62..f2e3891c62 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/189/filelists/dtc +++ b/config/rootfiles/oldcore/189/filelists/dtc diff --cc config/rootfiles/oldcore/189/filelists/ntp index 0000000000,7542d86cb0..7542d86cb0 mode 000000,120000..120000 --- a/config/rootfiles/oldcore/189/filelists/ntp +++ b/config/rootfiles/oldcore/189/filelists/ntp diff --cc doc/language_missings index f3d945c5b3,6a44630bd8..2a2333d948 --- a/doc/language_missings +++ b/doc/language_missings @@@ -154,11 -160,13 +160,14 @@@ < spec rstack overflow < system time < timeformat + < total < transport mode does not support vti < warning + < wg + < whitelisted < wireguard < wlanap +< wlanap hide ssid < wlanap psk < wlanap wireless mode < wlanap wlan clients @@@ -182,12 -194,15 +195,16 @@@ < ovpn roadwarrior server < processors < reg_file_data_sampling + < scanned < system time < timeformat + < total < upload fcdsl.o < warning + < wg + < whitelisted < wireguard +< wlanap hide ssid < wlanap psk < wlanap wireless mode < wlanap wlan clients