diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-24 19:19:21 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2016-02-24 19:19:21 +0100 |
| commit | 07cd74da368b1baca286cedf6d743a48792d15f5 (patch) | |
| tree | 27162d59cd32f53493977b6fe7a50420de0eb5cf /community/meetings.mdwn | |
| parent | e21fadaf306d17c53055153bd1fe3797886eeb26 (diff) | |
| parent | e164cc3bc34b10fb415d146dcc1db3abe12fb1d2 (diff) | |
| download | web-07cd74da368b1baca286cedf6d743a48792d15f5.tar.gz web-07cd74da368b1baca286cedf6d743a48792d15f5.tar.bz2 web-07cd74da368b1baca286cedf6d743a48792d15f5.zip | |
Merge commit 'e21fadaf306d17c53055153bd1fe3797886eeb26'; commit 'e164cc3bc34b10fb415d146dcc1db3abe12fb1d2' into HEAD
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]] |