Merge branch '1.6' into dev

3d6edb1a · Éloïs · 9d1df3f0 · efe8992f · 3d6edb1a · 3d6edb1a
Commit 3d6edb1a authored 7 years ago by Éloïs
--- a/app/service/GlobalFifoPromise.ts
+++ b/app/service/GlobalFifoPromise.ts
--- a/app/service/IdentityService.ts
+++ b/app/service/IdentityService.ts
--- a/app/service/MembershipService.ts
+++ b/app/service/MembershipService.ts
--- a/app/service/PeeringService.ts
+++ b/app/service/PeeringService.ts
--- a/app/service/TransactionsService.ts
+++ b/app/service/TransactionsService.ts
--- a/doc/Protocol.md
+++ b/doc/Protocol.md
--- a/duniter.sh
+++ b/duniter.sh
--- a/gui/index.html
+++ b/gui/index.html
--- a/index.ts
+++ b/index.ts
--- a/license-header.txt
+++ b/license-header.txt
--- a/package.json
+++ b/package.json
--- a/release/arch/arm/build-arm.sh
+++ b/release/arch/arm/build-arm.sh
--- a/release/arch/linux/0.24.4_common.gypi
+++ b/release/arch/linux/0.24.4_common.gypi
--- a/release/arch/linux/build-lin.sh
+++ b/release/arch/linux/build-lin.sh
--- a/release/arch/windows/0.24.4_common.gypi
+++ b/release/arch/windows/0.24.4_common.gypi
--- a/release/arch/windows/build.bat
+++ b/release/arch/windows/build.bat
--- a/release/arch/windows/duniter.iss
+++ b/release/arch/windows/duniter.iss
--- a/release/extra/debian/package/DEBIAN/control
+++ b/release/extra/debian/package/DEBIAN/control
--- a/release/extra/systemd/duniter.service
+++ b/release/extra/systemd/duniter.service
--- a/release/scripts/create-release.js
+++ b/release/scripts/create-release.js