Merge branch 'master' into experimental

Conflicts: site.conf
2015-02-16 07:04:54 +01:00
parent 0de9482f89 9683e47c41
commit 09c984e704
3 changed files with 13 additions and 13 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@

 ## 2015.1 (NOT RELEASED YET)
 - Updated to Gluon 2014.4 release
+ - Autoupdater
+   - Now enabled per default
+   - Also fetch firmware from build.freifunk-muenchen.de
+   - Require two signatures instead of one for stable autoupdate

 ## snapshot~20141119
 - fixed ipv4-prefix to /16 netmask