diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2014-02-26 20:13:52 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2014-02-26 20:13:52 +0100 |
| commit | 4b1317d9ab1a9ee409634de0962c964b8d801ba0 (patch) | |
| tree | ac0fe0f7a686571533bef3450c267781895a6ba1 /community/meetings.mdwn | |
| parent | c73e48c85d76a6b61a9fe7ddb7a98038a342a1c8 (diff) | |
| parent | c954f1095918874c73511ffc13f95eef518a8043 (diff) | |
| download | web-4b1317d9ab1a9ee409634de0962c964b8d801ba0.tar.gz web-4b1317d9ab1a9ee409634de0962c964b8d801ba0.tar.bz2 web-4b1317d9ab1a9ee409634de0962c964b8d801ba0.zip | |
Merge commit 'c954f1095918874c73511ffc13f95eef518a8043'
Conflicts:
community/meetings.mdwn
Diffstat (limited to 'community/meetings.mdwn')
| -rw-r--r-- | community/meetings.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/community/meetings.mdwn b/community/meetings.mdwn index 1d8199ad..bb90a2ab 100644 --- a/community/meetings.mdwn +++ b/community/meetings.mdwn @@ -1,5 +1,5 @@ -[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free -Software Foundation, Inc."]] +[[!meta copyright="Copyright © 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 +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 |