aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortg(x) <*@tg-x.net>2016-10-11 17:39:34 +0200
committertg(x) <*@tg-x.net>2016-10-11 17:39:34 +0200
commit07a78fa56cf51c2f5254fe7f3be55f5431af7ffa (patch)
tree219e82c6520ff07a60bb709e6e31983e38436661
parentced461cba2e2470226c2ac7deeb7ab43c6efff08 (diff)
parentcaec2ea67a91d8b802a7af8f7fd71c45d451e7fc (diff)
Merge branch 'master' of taler.net:/var/git/wallet-webex
-rw-r--r--manifest.json4
m---------web-common0
2 files changed, 2 insertions, 2 deletions
diff --git a/manifest.json b/manifest.json
index 719330ab6..8c5b5f475 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"description": "Privacy preserving and transparent payments",
"manifest_version": 2,
"name": "GNU Taler Wallet (git)",
- "version": "0.6.20",
- "version_name": "0.1.0",
+ "version": "0.6.21",
+ "version_name": "0.1.1",
"minimum_chrome_version": "49",
diff --git a/web-common b/web-common
-Subproject ba180721f0355ce75b9a66f28ac77f0287604cb
+Subproject e9eb34dfb56c8e5a18fa7d555aa651a4532e8f3