[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] 02/03: Merge branch 'master' of git.taler.net:wallet
From: |
gnunet |
Subject: |
[taler-wallet-core] 02/03: Merge branch 'master' of git.taler.net:wallet-core |
Date: |
Sat, 02 Nov 2019 16:55:35 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository wallet-core.
commit 5e05c22c57dfd6ed28516f10e3460567c3bbfc08
Merge: d5794f50 70a23229
Author: ng0 <address@hidden>
AuthorDate: Sat Nov 2 15:54:43 2019 +0000
Merge branch 'master' of git.taler.net:wallet-core
.gitignore | 5 ++-
.npmignore | 19 ---------
Makefile | 11 +++++
build-system/taler-build-scripts | 2 +-
configure | 87 ----------------------------------------
configure.py | 15 ++-----
contrib/package-android.json | 8 ++++
manifest.json | 4 +-
package.json | 9 +++++
src/i18n/de.po | 10 ++---
src/i18n/en-US.po | 10 ++---
src/i18n/fr.po | 10 ++---
src/i18n/it.po | 10 ++---
src/i18n/sv.po | 10 ++---
src/i18n/taler-wallet-webex.pot | 10 ++---
src/talerTypes.ts | 10 ++++-
src/taleruri-test.ts | 56 +++++++++++++++++++++++++-
src/taleruri.ts | 27 +++++++------
src/types-test.ts | 3 +-
src/wallet.ts | 53 +++++++++++++++++-------
src/walletTypes.ts | 4 ++
src/webex/background.ts | 2 +-
src/webex/pages/pay.tsx | 14 ++++++-
src/webex/pages/tip.tsx | 2 +-
src/webex/wxApi.ts | 1 +
src/webex/wxBackend.ts | 19 ++++++---
26 files changed, 220 insertions(+), 191 deletions(-)
--
To stop receiving notification emails like this one, please contact
address@hidden.