Merge branch 'stable'

Bump Gluon to v2017.1.2
2017-08-14 21:36:16 +02:00
parent efbf94b1fc 76e8a5bffd
commit 2c5eb2f2b2
2 changed files with 15 additions and 9 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 826ac884936d695252ade6b8b4b27a8383580f5e
+GLUON_GIT_REF := v2017.1.2

 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key