Merge branch 'master' of taler.net:/var/git/wallet-webex

2016-10-11 17:39:34 +02:00 · 2016-10-11 17:39:34 +02:00 · 07a78fa56c
commit 07a78fa56c
parent ced461cba2 caec2ea67a
2 changed files with 3 additions and 3 deletions
--- 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",

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit ba180721f0355ce75b9a66f28ac77f0287604cbd
+Subproject commit e9eb34dfb56c8e5a18fa7d555aa651a4532e8f3c