projects
/
wiki
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1720360
)
Add link to Fossetcon 2015.
author
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 15 Nov 2015 23:36:28 +0000
(
00:36
+0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 15 Nov 2015 23:36:28 +0000
(
00:36
+0100)
activities.mdwn
patch
|
blob
|
history
diff --git
a/activities.mdwn
b/activities.mdwn
index
4218fbf
..
4332bcd
100644
(file)
--- a/
activities.mdwn
+++ b/
activities.mdwn
@@
-5,6
+5,13
@@
you are holding a meeting or writing an article about VPNs and also
mention tinc, please [[tell us|contact]]. If you know of any we have
not listed here, we would also like to hear about it.
mention tinc, please [[tell us|contact]]. If you know of any we have
not listed here, we would also like to hear about it.
+### Upcoming events
+
+* [Fossetcon](http://www.fossetcon.org/2015)
+ November 19-21, 2015, at Hilton Lake Buena Vista, United States.
+ There is a talk titled [Secure peer networking with tinc](http://www.fossetcon.org/2015/sessions/secure-peer-networking-tinc)
+ in Palm 4 from 10:15 to 11:00.
+
### Past events
* [OHM2013](https://ohm2013.org/site/),
### Past events
* [OHM2013](https://ohm2013.org/site/),