diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2016-03-18 10:51:44 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2016-03-18 10:51:44 +0100 |
| commit | 74cea5526f697635a3b7a702c733c27a6258eb8e (patch) | |
| tree | 19e1a6deda4d1f70c2dd8fc6ac96ad2070e55392 /media_appearances.mdwn | |
| parent | f4ebd8729a7bd62cda48798cd19f47d2805c5f1d (diff) | |
| parent | 895751fb07e382499b4afb8339a5bdd0ee9a2c2b (diff) | |
Merge commit '895751fb07e382499b4afb8339a5bdd0ee9a2c2b'
Diffstat (limited to 'media_appearances.mdwn')
| -rw-r--r-- | media_appearances.mdwn | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/media_appearances.mdwn b/media_appearances.mdwn index 99af13ec..c8cab756 100644 --- a/media_appearances.mdwn +++ b/media_appearances.mdwn @@ -1,4 +1,4 @@ -[[!meta copyright="Copyright © 2010, 2011, 2012, 2013, 2015 Free Software +[[!meta copyright="Copyright © 2010, 2011, 2012, 2013, 2015, 2016 Free Software Foundation, Inc."]] [[!meta license="""[[!toggle id="license" text="GFDL 1.2+"]][[!toggleable @@ -16,8 +16,20 @@ A lot of stuff is missing here. [[!toc levels=2]] +# 2016 + +## January + + * FOSDEM: {{$community/meetings/fosdem_2016#ragkousis_guix_hurd}} + * FOSDEM: {{$community/meetings/fosdem_2016#thibault_hurd}} + + # 2015 +## August + + * Debconf 15: {{$community/meetings/debconf15#youpi_hurd}} + ## February * FOSDEM: {{$community/meetings/fosdem_2015#thibault_hurd}} |