projects
/
wiki
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add newline to avoid confusing markdown.
[wiki]
/
activities.mdwn
diff --git
a/activities.mdwn
b/activities.mdwn
index
9d8118e
..
142013f
100644
(file)
--- a/
activities.mdwn
+++ b/
activities.mdwn
@@
-5,6
+5,12
@@
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
+
+* [Chaos Communication Camp](http://events.ccc.de/camp/2011/),
+ August 10-14, 2011, in Finowfurt, Germany.
+ We are present in the [Milliways village](http://events.ccc.de/camp/2011/wiki/Milliways).
+
### Past events
* [FOSDEM](http://fosdem.org/2011/),
### Past events
* [FOSDEM](http://fosdem.org/2011/),