diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2015-10-07 21:38:30 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2015-10-07 21:38:30 +0200 |
| commit | b4c22bb08fa29f2747e3b77004821d2e9badb7e6 (patch) | |
| tree | 66cf904cd6b93ffd1893a19a955ca01798373bdd /documentation.mdwn | |
| parent | 095af72d2c6cf6269d2b139634183e7e53033a54 (diff) | |
| parent | a26cfb9c30ab60ca71d84f86d002b718f351efdc (diff) | |
| download | web-b4c22bb08fa29f2747e3b77004821d2e9badb7e6.tar.gz web-b4c22bb08fa29f2747e3b77004821d2e9badb7e6.tar.bz2 web-b4c22bb08fa29f2747e3b77004821d2e9badb7e6.zip | |
Merge commit 'a26cfb9c30ab60ca71d84f86d002b718f351efdc'
Diffstat (limited to 'documentation.mdwn')
| -rw-r--r-- | documentation.mdwn | 1 |
1 files changed, 1 insertions, 0 deletions
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 |