From ee87b58bb4593b117fe2bacfde67ca9b14cccaf4 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 21 Dec 2018 20:26:32 +0100
Subject: [PATCH] bump version numbers to gluon v2018.1.4

---
 README.md           | 1 +
 config/defaults.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 45a61af..94d5584 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- v2018.1.4.0: site-ffhh: v2018.1.4.0, gluon: v2018.1.4
 - v2018.1.3.0: site-ffhh: v2018.1.3.0, gluon: v2018.1.3
 - v2018.1.1.0: site-ffhh: v2018.1.1.0, gluon: v2018.1.1
 - v2018.1.0.0: site-ffhh: v2018.1.0.0, gluon: v2018.1 (never rolled out due to issues with the auto updater in gluon)
diff --git a/config/defaults.erb b/config/defaults.erb
index 8704739..17a8eb6 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -1,7 +1,7 @@
 <%
 gluon_branch = "stable"
 #gluon_branch = "experimental"
-gluon_release = "v2018.1.3.0"
+gluon_release = "v2018.1.4.0"
 
 # Add the +exp and current date if this is an experimental release
 gluon_release += "~exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"