diff options
| author | Phil <phil.buschmann@tum.de> | 2018-06-11 22:10:32 +0200 |
|---|---|---|
| committer | Phil <phil.buschmann@tum.de> | 2018-06-11 22:10:32 +0200 |
| commit | 09b6a814e0ddcca0497c5cbf37940c27e6a5d9de (patch) | |
| tree | f9884590450463aa95d9f858e9992e103467e89e /src/json/json_generator.c | |
| parent | c1062075eddca49cfeaac8f7fd8c84e73198c2aa (diff) | |
| parent | bb581dc55bfb90fc7f34797111b55d16e69b7af0 (diff) | |
| download | gnunet-09b6a814e0ddcca0497c5cbf37940c27e6a5d9de.tar.gz gnunet-09b6a814e0ddcca0497c5cbf37940c27e6a5d9de.zip | |
-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
Diffstat (limited to 'src/json/json_generator.c')
| -rw-r--r-- | src/json/json_generator.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/json/json_generator.c b/src/json/json_generator.c index 98f7163bc..dd6df4f74 100644 --- a/src/json/json_generator.c +++ b/src/json/json_generator.c | |||
| @@ -2,16 +2,18 @@ | |||
| 2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
| 3 | Copyright (C) 2014, 2015, 2016 GNUnet e.V. | 3 | Copyright (C) 2014, 2015, 2016 GNUnet e.V. |
| 4 | 4 | ||
| 5 | GNUnet is free software; you can redistribute it and/or modify it under the | 5 | GNUnet is free software: you can redistribute it and/or modify it |
| 6 | terms of the GNU General Public License as published by the Free Software | 6 | under the terms of the GNU Affero General Public License as published |
| 7 | Foundation; either version 3, or (at your option) any later version. | 7 | by the Free Software Foundation, either version 3 of the License, |
| 8 | 8 | or (at your option) any later version. | |
| 9 | GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY | 9 | |
| 10 | WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR | 10 | GNUnet is distributed in the hope that it will be useful, but |
| 11 | A PARTICULAR PURPOSE. See the GNU General Public License for more details. | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 | You should have received a copy of the GNU General Public License along with | 13 | Affero General Public License for more details. |
| 14 | GNUnet; see the file COPYING. If not, If not, see <http://www.gnu.org/licenses/> | 14 | |
| 15 | You should have received a copy of the GNU Affero General Public License | ||
| 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | 17 | */ |
| 16 | /** | 18 | /** |
| 17 | * @file json/json_generator.c | 19 | * @file json/json_generator.c |