Merge branch 'master' into 'master'

update to v1.7

See merge request !7

README.md

@@ -7,6 +7,8 @@ Freifunk Stuttgart specific Gluon configuration
 Doku: https://gluon.readthedocs.org/en/latest/user/site.html
 
 Gluon versions used for specific Stuttgart Freifunk Firmware builds:
+* ffs-1.7: v2018.2.3-ffs0.1
+* ffs-1.6: v2018.2.2-ffs0.1
 * ffs-1.4: v2017.1.5 (LEDE)
 * ffs-1.3: v2016.2.7 + 1340 mtu
 * ffs-1.2: v2016.2.6 + ffs-set-segment dns fix + 1312 mtu

site.mk

@@ -47,7 +47,7 @@ DEFAULT_BUILD_DATE := $(shell date '+%Y-%m-%d')
 
 BUILD_DATE ?= $(DEFAULT_BUILD_DATE)
 
-DEFAULT_GLUON_RELEASE := 1.6+$(BUILD_DATE)-g.$(shell git -C $(GLUON_SITEDIR)/gluon log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUON_SITEDIR) log --pretty=format:'%h' -n 1)
+DEFAULT_GLUON_RELEASE := 1.7+$(BUILD_DATE)-g.$(shell git -C $(GLUON_SITEDIR)/gluon log --pretty=format:'%h' -n 1)-s.$(shell git -C $(GLUON_SITEDIR) log --pretty=format:'%h' -n 1)
 
 GLUON_LANGS := de en