Merge branch 'stable'

This commit is contained in:
Franz Pletz
2015-06-18 13:05:01 +02:00

View File

@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git
GLUON_GIT_REF := 620f01f513012757a66d782ef0e930245fcdc1e8
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := v2015.1.1
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key