Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

duniter
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Service Desk
- Model experiments

Snippets Groups Projects

bb13a3e6

Commit bb13a3e6 authored 5 years ago by Éloïs

Downloads
- Plain Diff

Merge branch '1.7' into dev

parents b142100f 8e3ba1c6

Branches

Tags

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 12 additions, 0 deletions

CHANGELOG.md
app/lib/dal/indexDAL/leveldb/LevelDBCindex.ts 2 additions, 1 deletion

app/lib/dal/indexDAL/leveldb/LevelDBCindex.ts
app/lib/indexer.ts 4 additions, 3 deletions

app/lib/indexer.ts
gui/index.html 1 addition, 1 deletion

gui/index.html
package.json 2 additions, 2 deletions

package.json
release/arch/windows/duniter.iss 1 addition, 1 deletion

release/arch/windows/duniter.iss
release/extra/debian/package/DEBIAN/control 1 addition, 1 deletion

release/extra/debian/package/DEBIAN/control
test/integration/fork-resolution/block-with-comebacker-revert.ts 1 addition, 1 deletion

...tegration/fork-resolution/block-with-comebacker-revert.ts
test/integration/fork-resolution/coming-back-with-less-than-sigqty.ts 106 additions, 0 deletions

...tion/fork-resolution/coming-back-with-less-than-sigqty.ts

with 130 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment