[gimp-web/master: 10/10] Merge branch 'testing' into merge-testing

[Michael Schumacher <schumaml src gnome org>]

commit c48ab6a906ae91a8b5b32dc4cc470975d43778fe
Merge: 36d383a2 352cf506
Author: Michael Schumacher <schumaml gmx de>
Date:   Thu May 28 00:10:21 2020 +0200

    Merge branch 'testing' into merge-testing

 .gitignore                             |  1 +
 Makefile                               | 10 ++++++++++
 content/downloads/mirrors2.json        | 34 +++++++++++++---------------------
 pelicanconf.local.py                   |  5 ++++-
 pelicanconf.py                         |  5 ++++-
 pelicanconf.static.py                  | 19 +++++++++++++++++++
 pelicanconf.testing.py                 |  5 ++++-
 pelicanconf_common.py                  |  6 +++---
 plugins/gimp_mirrors/gimp_mirrors.py   | 14 +++++++-------
 plugins/random_header/random_header.py |  6 +++---
 10 files changed, 68 insertions(+), 37 deletions(-)
---