Browse Source

Merge branch 'testing' into stable

Karsten Böddeker 7 years ago
parent
commit
58fa72f77f
2 changed files with 2 additions and 2 deletions
  1. 1 1
      modules
  2. 1 1
      site.mk

+ 1 - 1
modules

@@ -2,4 +2,4 @@ GLUON_SITE_FEEDS='ffho'
 
 PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffho-packages.git
 PACKAGES_FFHO_BRANCH=v2016.2.x
-PACKAGES_FFHO_COMMIT=b4924e41bb3622b57e7ab8514dacbaa1d1133c45
+PACKAGES_FFHO_COMMIT=a723748cac47b8484cd9a24b957b36a160dcd77c

+ 1 - 1
site.mk

@@ -61,7 +61,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.0.0~exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 1.0.1~exp$(shell date '+%Y%m%d')
 DEFAULT_GLUON_PRIORITY := 0
 
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)