diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-02-01 17:47:51 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-02-01 17:47:51 +0100 |
| commit | 9265ccb82e9ed45c69efd3781cd2bcf77c85cf15 (patch) | |
| tree | 90b2dfe322e82890c6edb94d4d0acb29bd1d3fb7 /community | |
| parent | a37cdc314b593905af298d3a78b77ff6faff919e (diff) | |
| parent | 084019007a8bfd9d7d5ad1563bd146e1bb24bc87 (diff) | |
Merge branch 'master' of braunbox:~hurd-web/hurd-web
Diffstat (limited to 'community')
| -rw-r--r-- | community/meetings.mdwn | 4 | ||||
| -rw-r--r-- | community/meetings/fosdem_2016.mdwn | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index 98ced949..f2c35e2f 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -1,5 +1,5 @@ [[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, -2015 Free Software Foundation, Inc."]] +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 @@ -13,6 +13,8 @@ License|/fdl]]."]]"""]] # Upcoming + * [[FOSDEM_2016]] + # Past diff --git a/community/meetings/fosdem_2016.mdwn b/community/meetings/fosdem_2016.mdwn index 507ec30d..f175af09 100644 --- a/community/meetings/fosdem_2016.mdwn +++ b/community/meetings/fosdem_2016.mdwn @@ -22,6 +22,7 @@ Bruxelles. [[!table class="table_style_1" data=""" "Name","Attending","Arrival","Return" "Samuel Thibault","yes","Saturday, 09:17 BRU","Sunday, 19:13 BRU" +"[[Thomas Schwinge|tschwinge]]","yes","Friday, 17:35, Bruxelles Midi","Sunday, 18:25, Bruxelles Midi" """]] |