Merge branch '1.6' into dev

4702dcec · Éloïs · a36d2892 · 35374e16 · 4702dcec · 4702dcec
Commit 4702dcec authored 7 years ago by Éloïs
--- a/gui/index.html
+++ b/gui/index.html
@@ -3,7 +3,7 @@
 <head>
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>Duniter 1.6.12</title>
+  <title>Duniter 1.6.13</title>
  <style>
    html {
      font-family: "Courier New", Courier, monospace;

--- a/package.json
+++ b/package.json
 {
  "name": "duniter",
-  "version": "1.6.12",
+  "version": "1.6.13",
  "engines": {
    "node": ">=6.11.1",
    "npm": ">=3.10"
@@ -12,7 +12,7 @@
  "node-main": "./bin/duniter",
  "window": {
    "icon": "duniter.png",
-    "title": "v1.6.12",
+    "title": "v1.6.13",
    "width": 800,
    "height": 800,
    "min_width": 750,

--- a/release/arch/debian/package/DEBIAN/control
+++ b/release/arch/debian/package/DEBIAN/control
 Package: duniter
-Version: 1.6.12
+Version: 1.6.13
 Depends: unzip
 Section: misc
 Priority: optional

--- a/release/arch/windows/duniter.iss
+++ b/release/arch/windows/duniter.iss
@@ -15,7 +15,7 @@
 #error "Unable to find MyAppExe"
 #endif

-#define MyAppVerStr "v1.6.12"
+#define MyAppVerStr "v1.6.13"

 [Setup]
 AppName={#MyAppName}

--- a/test/integration/branches.js
+++ b/test/integration/branches.js
@@ -51,7 +51,7 @@ describe("Branches", () => co(function*() {
    it('should have a 3 blocks fork window size', function() {
      return expectAnswer(rp('http://127.0.0.1:7778/node/summary', { json: true }), function(res) {
        res.should.have.property('duniter').property('software').equal('duniter');
-        res.should.have.property('duniter').property('version').equal('1.6.12');
+        res.should.have.property('duniter').property('version').equal('1.6.13');
        res.should.have.property('duniter').property('forkWindowSize').equal(3);
      });
    });