[taler-taler-merchant-demos] 15/18: Merge branch 'torsten-redesign' of git+ssh://git.taler.net/taler-merchant-demos into torsten-redesign

[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 61edc480faa9da24cd2c9a221aedbaf6829700f5
Merge: 728c4bf 2f4403f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Sep 6 22:15:24 2020 +0200

    Merge branch 'torsten-redesign' of 
git+ssh://git.taler.net/taler-merchant-demos into torsten-redesign

 .gitignore                                                   |  3 +++
 talermerchantdemos/.gitignore                                |  6 ++++++
 talermerchantdemos/blog/templates/base.html                  | 12 +++++++-----
 talermerchantdemos/static/{demo.css => demo.scss}            |  0
 talermerchantdemos/static/{pure.css => pure.scss}            |  2 +-
 .../static/{taler-fallback.css => taler-fallback.scss}       |  0
 6 files changed, 17 insertions(+), 6 deletions(-)

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