summaryrefslogtreecommitdiff
path: root/community/meetings.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'community/meetings.mdwn')
-rw-r--r--community/meetings.mdwn4
1 files changed, 3 insertions, 1 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index 6c15d144..4ae52a1a 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -13,15 +13,17 @@ License|/fdl]]."]]"""]]
# Upcoming
- * [[GNU Hackers Meeting, 2011, Paris|ghm2011]]
## In the Future
+ * [[FOSDEM_2012]]
* [[Self-organised]]
# Past
+ * [[FrOSCon_2011]]
+ * [[GNU Hackers Meeting, 2011, Paris|ghm2011]]
* [[FOSDEM_2011]]
* [[DebConf10]]
* [[GNU Hackers Meeting, 2010, Den Haag|ghm2010]]