diff options
| author | Christian Grothoff <christian@grothoff.org> | 2016-08-30 14:27:58 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2016-08-30 14:27:58 +0200 |
| commit | 5346a2b9167c027820e6f3ef2f4457933192a6a1 (patch) | |
| tree | 9da86eefda3340aa6c892b25f63801b0b7f6c53c /common | |
| parent | 7c476dafacdbb917e2f2d8ecc49eaa385f905571 (diff) | |
| parent | 8921e899b300ead12f76f3c1afda2ce83d5e77ef (diff) | |
| download | www-5346a2b9167c027820e6f3ef2f4457933192a6a1.tar.gz www-5346a2b9167c027820e6f3ef2f4457933192a6a1.zip | |
merge
Diffstat (limited to 'common')
| -rw-r--r-- | common/footer.inc | 2 | ||||
| -rw-r--r-- | common/header.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/footer.inc b/common/footer.inc index 5227c71c..fa37c959 100644 --- a/common/footer.inc +++ b/common/footer.inc | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <div class="footer"> | 1 | <div class="footer"> |
| 2 | <p>© <a href="https://gnunet.org/ev">GNUnet e.V.</a> 2015</p> | 2 | <p>© <a href="https://gnunet.org/ev">GNUnet e.V.</a> and Inria 2015, 2016</p> |
| 3 | <p lang="en">This page was created using <a href="https://www.gnu.org/">Free Software</a> only.</p> | 3 | <p lang="en">This page was created using <a href="https://www.gnu.org/">Free Software</a> only.</p> |
| 4 | <p lang="de">Diese Seite wurde allein durch Einsatz von <a href="https://www.gnu.org/">Freier Software</a> erstellt.</p> | 4 | <p lang="de">Diese Seite wurde allein durch Einsatz von <a href="https://www.gnu.org/">Freier Software</a> erstellt.</p> |
| 5 | <p lang="fr">This page was created using <a href="https://www.gnu.org/">Free Software</a> only.</p> | 5 | <p lang="fr">This page was created using <a href="https://www.gnu.org/">Free Software</a> only.</p> |
diff --git a/common/header.inc b/common/header.inc index 11d92f51..560e3fdd 100644 --- a/common/header.inc +++ b/common/header.inc | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | @licstart The following is the entire license notice for the | 3 | @licstart The following is the entire license notice for the |
| 4 | JavaScript code in this page. | 4 | JavaScript code in this page. |
| 5 | 5 | ||
| 6 | Copyright (C) 2014,2015 GNUnet e.V. | 6 | Copyright (C) 2014, 2015, 2016 GNUnet e.V. |
| 7 | 7 | ||
| 8 | The JavaScript code in this page is free software: you can | 8 | The JavaScript code in this page is free software: you can |
| 9 | redistribute it and/or modify it under the terms of the GNU | 9 | redistribute it and/or modify it under the terms of the GNU |