Merge branch 'beta' of ssh://github.com/freifunk-stuttgart/site-ffs into beta

686f8e13 · Leonard Penzer · a08d4507 · 0f7547c8 · 686f8e13
Commit 686f8e13 authored 9 years ago by Leonard Penzer
--- a/site.conf
+++ b/site.conf
@@ -102,6 +102,7 @@
                                pubkeys = {
                                        '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
 					'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are	
+					'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
                                },
                        },
                        beta = {
@@ -113,6 +114,7 @@
                                pubkeys = {
                                        '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
 					'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are	
+					'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
                                },
                        },
                        nightly = {
@@ -124,6 +126,7 @@
                                pubkeys = {
                                        '4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
 					'0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are	
+					'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
                                },
                        },
                },