X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=6f44424d095b03836e2854f9f3ccf70ec6709a56;hb=13d500c36d3a5aba6005e3ac85b8bb2b235df529;hp=8074277ca20fa0e29d262dfb4a436cb1ca228f4c;hpb=96fb70cb5ebb5338d90d3d2d97405e5468efa71f;p=wiki diff --git a/activities.mdwn b/activities.mdwn index 8074277..6f44424 100644 --- a/activities.mdwn +++ b/activities.mdwn @@ -10,7 +10,7 @@ not listed here, we would also like to hear about it. * [SCALE 14x](https://www.socallinuxexpo.org/scale/14x), January 21-24, 2016, in the Pasedana Convention Center, California, United States. There is a talk titled [Secure Mesh VPN w/ Service Discovery](https://www.socallinuxexpo.org/scale/14x/presentations/secure-mesh-vpn-w-service-discovery) - in Ballroom F from 11:30 to 12:30. + on the 23rd from 11:30 to 12:30 in Ballroom F. ### Past events