[taler-merchant] branch master updated (c5413074 -> 0008f3ec)

[gnunet]

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

sebasjm pushed a change to branch master
in repository merchant.

    from c5413074 update
     new 9b6376ed take backend from walletcore
     new 0008f3ec latest from wallet-core prebuilt

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/Makefile.am | 12 ++++++------
 contrib/wallet-core |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 4ffb7c89..daebbd30 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -3,13 +3,13 @@ staticpkgdatadir = $(prefix)/share/taler/merchant/static/
 spapkgdatadir = $(prefix)/share/taler/merchant/spa/
 
 dist_tmplpkgdata_DATA = \
-  wallet-core/backend/depleted_tip.en.must \
-  wallet-core/backend/offer_refund.en.must \
-  wallet-core/backend/offer_tip.en.must \
-  wallet-core/backend/request_payment.en.must \
-  wallet-core/backend/show_order_details.en.must
+  depleted_tip.en.must \
+  offer_refund.en.must \
+  offer_tip.en.must \
+  request_payment.en.must \
+  show_order_details.en.must
 
-%.must: merchant-backoffice/%.html 
+%.must: wallet-core/backend/%.html 
        cp $< $@
 
 # Note: only works when building from Git, if you
diff --git a/contrib/wallet-core b/contrib/wallet-core
index cab8eefb..13119702 160000
--- a/contrib/wallet-core
+++ b/contrib/wallet-core
@@ -1 +1 @@
-Subproject commit cab8eefb9b00bd48950372df195b9c862ff24079
+Subproject commit 13119702d90733174fc69a75de46bda6401d083d

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