Skip to content
Snippets Groups Projects
Commit 3f23f2bd authored by Bjoern Franke's avatar Bjoern Franke
Browse files

Merge branch 'master' into 'master'

remove pic from pubkeys

ich werde an der fw dev nur als nutzer teilnehmen.
ich kümmer mich um linux. das die srv laufen.

See merge request !7
parents e4c0ae5d 9426dd24
No related branches found
No related tags found
No related merge requests found
......@@ -90,7 +90,6 @@
'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
'564d897c81cf35b6c7a896513834fd8886cbe3c55efbeba8e8d5bbf9ff0d8dbe', --pic
},
},
testing = {
......@@ -107,7 +106,6 @@
'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
'564d897c81cf35b6c7a896513834fd8886cbe3c55efbeba8e8d5bbf9ff0d8dbe', --pic
},
},
},
......@@ -137,4 +135,4 @@ legacy = {
tc_configs = {'ffnw', 'freifunk'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
},
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment