Merge branch 'experimental'

README

@@ -1,9 +1,5 @@
 Freifunk Community Pinneberg
 Site-Konfiguration "site-ffpi"
 
-Dieses ist der Experimental-Branch.
+Dieses ist der Stable-Branch.
 
-Bitte nicht im Produktivbetrieb nutzen.
-Es kann sich alles jederzeit unerwartet ändern.
-
-Betrieb auf eigenes Risiko!

i18n/de.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: FFPI 1.0\n"
-"PO-Revision-Date: 2016-10-20 19:18+0100\n"
+"Project-Id-Version: FFPI 1.2\n"
+"PO-Revision-Date: 2017-07-23 11:06+0100\n"
 "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
 "Language-Team: German\n"
 "Language: de\n"

i18n/en.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
-"Project-Id-Version: FFPI 1.0\n"
-"PO-Revision-Date: 2016-10-20 19:18+0100\n"
+"Project-Id-Version: FFPI 1.2\n"
+"PO-Revision-Date: 2017-07-23 11:06+0100\n"
 "Last-Translator: Thomas Hooge <thomas@hoogi.de>\n"
 "Language-Team: English\n"
 "Language: en\n"

site.conf

@@ -5,7 +5,7 @@
     opkg = {
         openwrt = 'http://1.download.services.ffpi/openwrt/%n/%v/%S/packages',
         extra = {
-            modules = 'http://1.download.services.ffpi/experimental/modules/gluon-%GS-%GR/%S',
+            modules = 'http://1.download.services.ffpi/stable/modules/gluon-%GS-%GR/%S',
         },
     },
     prefix4 = '10.137.0.0/16',
@@ -90,7 +90,7 @@
         }
     },
     autoupdater = {
-        branch = 'experimental',
+        branch = 'stable',
         branches = {
             stable = {
                 name = 'stable',

site.mk

@@ -103,7 +103,7 @@ GLUON_SITE_PACKAGES += \
     $(USB_PACKAGES_STORAGE)
 endif
 
-DEFAULT_GLUON_RELEASE := 0.9+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.9
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)