[taler-merchant] branch master updated: fix bootstrap

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 0604cb36 fix bootstrap
0604cb36 is described below

commit 0604cb36393129bd292caf1fab3e267fb2030fc8
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jun 25 16:10:38 2021 +0200

    fix bootstrap
---
 bootstrap        | 1 +
 debian/changelog | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/bootstrap b/bootstrap
index d844b7c2..e3e4d3d4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -34,6 +34,7 @@ autoreconf -if
 
 echo "Importing single-page app (from external Git repository)"
 cd contrib/merchant-backoffice
+git checkout prebuilt
 cp spa.html ..
 cd ../..
 
diff --git a/debian/changelog b/debian/changelog
index aa5cd731..5fdd5ca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+taler-merchant (0.9.0-6) unstable; urgency=low
+
+  * Update to latest merchant backoffice SPA logic.
+
+ -- Christian Grothoff <grothoff@gnu.org>  Thu, 17 Jun 2021 14:02:10 +0100
+
 taler-merchant (0.9.0-5) unstable; urgency=low
 
   * Update to latest upstream code.

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