diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2016-03-18 15:26:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2016-03-18 15:26:35 +0100 |
| commit | a1697dd527c6c7784c1aa9521a6e36e2d77b23f7 (patch) | |
| tree | 9a84652b897279cdc40b88f0e48c60e4a0d43b9b /documentation.mdwn | |
| parent | 82cd105a8249c39bbfc63483e2d5606d77d8e68e (diff) | |
| parent | 74cea5526f697635a3b7a702c733c27a6258eb8e (diff) | |
| download | web-a1697dd527c6c7784c1aa9521a6e36e2d77b23f7.tar.gz web-a1697dd527c6c7784c1aa9521a6e36e2d77b23f7.tar.bz2 web-a1697dd527c6c7784c1aa9521a6e36e2d77b23f7.zip | |
Merge commit '74cea5526f697635a3b7a702c733c27a6258eb8e'
Diffstat (limited to 'documentation.mdwn')
| -rw-r--r-- | documentation.mdwn | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/documentation.mdwn b/documentation.mdwn index b27ad8f3..263be828 100644 --- a/documentation.mdwn +++ b/documentation.mdwn @@ -1,5 +1,5 @@ -[[!meta copyright="Copyright © 2008, 2010, 2011, 2015 Free Software Foundation, -Inc."]] +[[!meta copyright="Copyright © 2008, 2010, 2011, 2015, 2016 Free Software +Foundation, Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable id="license" text="Permission is granted to copy, distribute and/or modify this @@ -84,6 +84,11 @@ from userlandish interfaces (Hurd) or from the micro kernel itself (Mach). # Presentations +## 2016 + + * FOSDEM: {{$community/meetings/fosdem_2016#ragkousis_guix_hurd}} + * FOSDEM: {{$community/meetings/fosdem_2016#thibault_hurd}} + ## 2015 * FOSDEM: {{$community/meetings/fosdem_2015#thibault_hurd}} |