summaryrefslogtreecommitdiff
path: root/community/meetings.mdwn
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-08-22 21:46:16 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-08-22 21:46:50 +0200
commit776636f9de46b9cc50e35f579ab38b2da4831d8f (patch)
tree35d64c53c3db13a0bb7622a2387707dc560d6f59 /community/meetings.mdwn
parent064aec23d3be59c3136ed6e8a06199fa375ca480 (diff)
Add dc15 links
Diffstat (limited to 'community/meetings.mdwn')
-rw-r--r--community/meetings.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn
index e136cbee..98ced949 100644
--- a/community/meetings.mdwn
+++ b/community/meetings.mdwn
@@ -13,11 +13,11 @@ License|/fdl]]."]]"""]]
# Upcoming
- * [[FOSDEM_2015]]
-
# Past
+ * [[DebConf15]]
+ * [[FOSDEM_2015]]
* [[FOSDEM_2014]]
* [[GNU Hackers Meeting, 2013, Paris|ghm2013]]
* [[FOSDEM_2013]]