summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/meetings.mdwn4
-rw-r--r--documentation.mdwn1
2 files changed, 3 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]]
diff --git a/documentation.mdwn b/documentation.mdwn
index f2c30737..b27ad8f3 100644
--- a/documentation.mdwn
+++ b/documentation.mdwn
@@ -87,6 +87,7 @@ from userlandish interfaces (Hurd) or from the micro kernel itself (Mach).
## 2015
* FOSDEM: {{$community/meetings/fosdem_2015#thibault_hurd}}
+ * Debconf 15: {{$community/meetings/debconf15#youpi_hurd}}
## 2014