Merge branch 'master' into stable - taler-www

commit d54f7da415a69067f27b0dfa3ad3031456f58ec1
parent 9f647abc96d31c3c5dfc456d0260c1b88b2db6c7
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  3 Jul 2020 10:57:03 +0200

Merge branch 'master' into stable

	taler-www Main taler.net website
	Log \| Files \| Refs \| Submodules \| README \| LICENSE