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 /community/meetings.mdwn | |
| parent | f4ebd8729a7bd62cda48798cd19f47d2805c5f1d (diff) | |
| parent | 895751fb07e382499b4afb8339a5bdd0ee9a2c2b (diff) | |
Merge commit '895751fb07e382499b4afb8339a5bdd0ee9a2c2b'
Diffstat (limited to 'community/meetings.mdwn')
| -rw-r--r-- | community/meetings.mdwn | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index 98ced949..c3e8529a 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 @@ -14,8 +14,10 @@ License|/fdl]]."]]"""]] # Upcoming + # Past + * [[FOSDEM_2016]] * [[DebConf15]] * [[FOSDEM_2015]] * [[FOSDEM_2014]] |