[gimp-web/migrate/py3: 100/100] Merge branch 'pat/py3' into migrate/py3

[Pat David <patdavid src gnome org>]

commit 981ffbcfde2a0de893c8de875506f773e74f5c74
Merge: bbe0069f 2f22e438
Author: Pat David <patdavid gmail com>
Date:   Sun Apr 5 17:20:16 2020 -0500

    Merge branch 'pat/py3' into migrate/py3

 .gitignore                                         |   4 +-
 content/about/index.md                             |   4 +-
 content/about/meta/index.md                        |   3 +
 content/develop/index.md                           |   2 -
 content/docs/userfaq.md                            |  32 +-
 GIMP_VERSIONS => content/gimp_versions.json        | 641 +++++++++++++--------
 content/news/2019-07_GIMP-2.99.2_Released/.gitkeep |   0
 content/news/2019-07_GIMP-2.99.2_Released/index.md |  49 ++
 .../news/2019-10_GIMP-2.10.14_Released/.gitkeep    |   0
 .../gimp-2-10-14-filter-clipping.jpg               | Bin 0 -> 79421 bytes
 .../gimp-2-10-14-normal-map.jpg                    | Bin 0 -> 223279 bytes
 .../gimp-2-10-14-out-of-canvas.jpg                 | Bin 0 -> 124807 bytes
 .../gimp-2-10-14-wilber-and-co-out-of-canvas.jpg   | Bin 0 -> 296863 bytes
 .../news/2019-10_GIMP-2.10.14_Released/index.md    | 295 ++++++++++
 .../2019-report-curve-tool-update.jpg              | Bin 0 -> 270596 bytes
 .../2019-report-dds-exporting-options.png          | Bin 0 -> 240990 bytes
 .../2019-report-normal-map.jpg                     | Bin 0 -> 343940 bytes
 .../2020happynewyear.jpg                           | Bin 0 -> 173072 bytes
 .../2020/2020-01-04_2019_annual_report/index.md    | 141 +++++
 pelicanconf.local.py                               | 302 +---------
 pelicanconf.py                                     | 288 +--------
 pelicanconf.testing.py                             | 280 +--------
 pelicanconf_common.py                              | 360 ++++++++++++
 plugins/gimp_mirrors/gimp_mirrors.py               |   4 +-
 plugins/random_header/random_header.py             |   2 +-
 py2-requirements.txt                               |   6 +
 py3-requirements.txt                               |   6 +
 themes/newgimp/templates/article.html              |   2 +-
 .../newgimp/templates/downloads-development.html   |   7 +-
 themes/newgimp/templates/downloads-oldstable.html  |   6 +-
 themes/newgimp/templates/downloads.html            |  58 +-
 31 files changed, 1338 insertions(+), 1154 deletions(-)
---