From: Guus Sliepen Date: Tue, 22 Dec 2015 21:08:26 +0000 (+0100) Subject: Mention the exact day of the SCALE 14x talk. X-Git-Url: https://tinc-vpn.org/git/browse?p=wiki;a=commitdiff_plain;h=13d500c36d3a5aba6005e3ac85b8bb2b235df529 Mention the exact day of the SCALE 14x talk. --- 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