projects
/
wiki
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
96fb70c
)
Mention the exact day of the SCALE 14x talk.
author
Guus Sliepen
<guus@tinc-vpn.org>
Tue, 22 Dec 2015 21:08:26 +0000
(22:08 +0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Tue, 22 Dec 2015 21:08:26 +0000
(22:08 +0100)
activities.mdwn
patch
|
blob
|
history
diff --git
a/activities.mdwn
b/activities.mdwn
index
8074277
..
6f44424
100644
(file)
--- 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