[taler-taler-merchant-demos] 14/14: merge

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository taler-merchant-demos.

commit b0f3d60fec149ffee23872bd0e9290bebdf679e3
Merge: 30bad63 9cf423b
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Sep 6 11:20:15 2020 +0200

    merge

 README.md                                 | 18 +++++++++-------
 bin/taler-merchant-demos                  | 35 ++++++++++++++++++++-----------
 setup.py                                  |  8 +++----
 talermerchantdemos/blog/blog.py           | 21 ++++++++++++++-----
 talermerchantdemos/donations/donations.py | 18 ++++++++++++----
 talermerchantdemos/survey/survey.py       | 19 +++++++++++++----
 6 files changed, 83 insertions(+), 36 deletions(-)

diff --cc talermerchantdemos/blog/blog.py
index c024380,f079ecc..c54a8d6
--- a/talermerchantdemos/blog/blog.py
+++ b/talermerchantdemos/blog/blog.py
@@@ -24,9 -24,11 +24,10 @@@ import tracebac
  import uuid
  import base64
  import flask
 -import lxml.etree
  import time
+ import sys
  from urllib.parse import urljoin, urlencode, urlparse
- from taler.util.talerconfig import TalerConfig
+ from taler.util.talerconfig import TalerConfig, ConfigurationError
  from ..blog.content import ARTICLES, get_article_file, get_image_file
  from talermerchantdemos.httpcommon import backend_get, backend_post
  

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.