Commit 60fd0fdc authored by Birger's avatar Birger
Browse files

Merge branch 'patch-1' into 'master'

Update Api-File.in

especially for social participationn .. to API v0.4.12

See merge request !29
parents 4da57a65 2974eb0b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"lon": 7.8257, "lon": 7.8257,
"address": { "address": {
"Name": "Chaos Computer Club Freiburg", "Name": "Chaos Computer Club Freiburg",
"Street": "Dunantstr. 16a (Westarkaden)", "Street": "Dunantstr. 16a (Tram Berliner Allee)",
"Zipcode": "79110" "Zipcode": "79110"
} }
}, },
...@@ -76,6 +76,11 @@ ...@@ -76,6 +76,11 @@
"mapType": "list/status" "mapType": "list/status"
} }
], ],
"socialprojects": {
"number": 20,
"website": "https://freiburg.freifunk.net",
"contact": "kontakt@freiburg.freifunk.net"
},
"support": { "support": {
"club": { "club": {
"name": "Chaos Computer Club Freiburg e.V.", "name": "Chaos Computer Club Freiburg e.V.",
...@@ -113,6 +118,12 @@ ...@@ -113,6 +118,12 @@
"ipv6": [ "ipv6": [
{ {
"network": "fdf0:09bb:7814::/48" "network": "fdf0:09bb:7814::/48"
},
{
"network": "2001:bf7:2810:ff42::/64"
},
{
"network": "fdf0:9bb:7814:a630::/64"
} }
], ],
"ipv4": [ "ipv4": [
...@@ -122,15 +133,18 @@ ...@@ -122,15 +133,18 @@
] ]
}, },
"routing": [ "routing": [
"802.11s",
"batman-adv" "batman-adv"
], ],
"updatemode": [ "updatemode": [
"manual",
"autoupdate" "autoupdate"
], ],
"legals": [ "legals": [
"vpnnational",
"vpninternational", "vpninternational",
"institutions" "institutions"
] ]
}, },
"api": "0.4.9" "api": "0.4.12"
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment