diff options
author | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-26 15:38:27 +0200 |
---|---|---|
committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-09-26 15:38:27 +0200 |
commit | f1f74d36ad98d03a254beba743d19683768e5509 (patch) | |
tree | 300453b6cbddeeec74ff32d32d6a5e9705302404 /community | |
parent | 21109812e191adea52197648cdf6abc4b0eb4272 (diff) | |
parent | ff0ef239f8cedc6e7d24dc282ec2db3c3180a7a6 (diff) | |
download | web-f1f74d36ad98d03a254beba743d19683768e5509.tar.gz web-f1f74d36ad98d03a254beba743d19683768e5509.tar.bz2 web-f1f74d36ad98d03a254beba743d19683768e5509.zip |
Merge commit 'ff0ef239f8cedc6e7d24dc282ec2db3c3180a7a6'
Diffstat (limited to 'community')
-rw-r--r-- | community/meetings.mdwn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index d715066e..0c680ddb 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -1,5 +1,5 @@ -[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012 Free Software -Foundation, Inc."]] +[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013 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 @@ -22,6 +22,7 @@ License|/fdl]]."]]"""]] # Past + * [[GNU Hackers Meeting, 2013, Paris|ghm2013]] * [[GNU Hackers Meeting, 2012, Düsseldorf|ghm2012]] * [[FOSDEM_2012]] * [[FrOSCon_2011]] |