Merge remote-tracking branch 'upstream/master'

xianren78 · Dec 23, 2024 · c695381 · c695381
2 parents 33d009f + a218bd5
commit c695381
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/openwrt/build.sh b/openwrt/build.sh
@@ -191,8 +191,7 @@ fi
 # feeds mirror
 if [ "$1" = "rc2" ]; then
     packages="^$(grep packages feeds.conf.default | awk -F^ '{print $2}')"
-    #luci="^$(grep luci feeds.conf.default | awk -F^ '{print $2}')"
-    luci="^b43aea743e78bb478495d2bfca046a0417dbdfe7"
+    luci="^$(grep luci feeds.conf.default | awk -F^ '{print $2}')"
     routing="^$(grep routing feeds.conf.default | awk -F^ '{print $2}')"
     telephony="^$(grep telephony feeds.conf.default | awk -F^ '{print $2}')"
 else

diff --git a/tags/v24 b/tags/v24
@@ -1 +1 @@
-24.10.0-rc3
+24.10.0-rc4