Merge branch 'testing' into stable

modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=https://git.ffho.net/freifunkhochstift/ffho-packages.git
 PACKAGES_FFHO_BRANCH=master
-PACKAGES_FFHO_COMMIT=8a7a1ae9ade64447a24748755afe9b0413209521
+PACKAGES_FFHO_COMMIT=a2521ef8cd6774a0470a7b2568d0240e679e95e7

site.mk

@@ -18,7 +18,6 @@ GLUON_SITE_PACKAGES := \
 	ffho-autoupdater-wifi-fallback \
 	ffho-banner \
 	ffho-config-mode-site-select \
-	ffho-debug \
 	ffho-web-ap-timer \
 	ffho-web-autoupdater \
 	iwinfo \
@@ -56,7 +55,7 @@ ifeq ($(GLUON_TARGET),x86-64)
 endif
 
 # 0.2~1 < 0.2 < 0.2+1 < 0.2-1 < 0.2.1 < 0.3
-DEFAULT_GLUON_RELEASE := 1.2.0~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.2.1~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)