summaryrefslogtreecommitdiff
path: root/community/meetings.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'community/meetings.mdwn')
-rw-r--r--community/meetings.mdwn8
1 files changed, 3 insertions, 5 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index 0c680ddb..1d8199ad 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -13,16 +13,13 @@ License|/fdl]]."]]"""]]
# Upcoming
-
-## In the Future
-
- * [[FOSDEM_2013]]
- * [[Self-organised]]
+ * [[FOSDEM_2014]]
# Past
* [[GNU Hackers Meeting, 2013, Paris|ghm2013]]
+ * [[FOSDEM_2013]]
* [[GNU Hackers Meeting, 2012, Düsseldorf|ghm2012]]
* [[FOSDEM_2012]]
* [[FrOSCon_2011]]
@@ -39,4 +36,5 @@ License|/fdl]]."]]"""]]
* [[FOSDEM_2006]]
* [[RMLL_2005]]
* [[FOSDEM_2005]]
+ * [[OSDI_1994]]
* ...