Merge pull request #119 from ffac/update_v2023.2

maurerle · web-flow · commit c5a608086d36 · 2024-08-30T10:25:40.000+02:00
update gluon packages to latest main commit, update gluon to latest v2023.2.x commit
diff --git a/modules b/modules
@@ -1,9 +1,9 @@
 GLUON_SITE_FEEDS="community ffac"
 
 PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
-PACKAGES_COMMUNITY_COMMIT=106ff0544832fcc5573a1bea504c0b0a536cb1cd
-PACKAGES_COMMUNITY_BRANCH=update-location-gps
+PACKAGES_COMMUNITY_COMMIT=9ed96218f8e3adc302b52565eaca5069a131ce94
+PACKAGES_COMMUNITY_BRANCH=master
 
 PACKAGES_FFAC_REPO=https://github.com/ffac/gluon-packages.git
-PACKAGES_FFAC_COMMIT=b7ccdae873eebaa01aa555ec2a356d370e8d3908
-PACKAGES_FFAC_BRANCH=private-wan-dhcp-web
+PACKAGES_FFAC_COMMIT=c2b980177d7e222dcadbdf0bd96f39d5e892184a
+PACKAGES_FFAC_BRANCH=main
diff --git a/release.mk b/release.mk
@@ -1,2 +1,2 @@
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 05b36ba7608f7ac83373cd4bdfc34ef142e05c76 # v2023.2.x
+GLUON_GIT_REF := bd5c28e1a9ad58008911e0ec12728737cc01244c # v2023.2.x

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git`
`2`		`-GLUON_GIT_REF := 05b36ba7608f7ac83373cd4bdfc34ef142e05c76 # v2023.2.x`
	`2`	`+GLUON_GIT_REF := bd5c28e1a9ad58008911e0ec12728737cc01244c # v2023.2.x`