[gimp-web: 9/9] Merge branch 'testing'

[Michael Schumacher <schumaml src gnome org>]

commit fad035424f3e1bb02d1d804de2179d024f127043
Merge: d2fae653 6b274e79
Author: Michael Schumacher <schumaml gmx de>
Date:   Sun Dec 8 20:12:43 2019 +0100

    Merge branch 'testing'

 .gitignore                                  | 2 +-
 GIMP_VERSIONS => content/gimp_versions.json | 5 +++++
 pelicanconf.local.py                        | 6 +++---
 pelicanconf.py                              | 4 ++--
 pelicanconf.testing.py                      | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)
---