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

a258aeb0

Commit a258aeb0 authored 7 years ago by Éloïs

Downloads
- Plain Diff

Merge branch '1.6' into 'dev'

1.6

See merge request !1263

parents 3d6edb1a 45278c7d

Branches

Tags

1 merge request!12631.6

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

app/lib/dal/fileDAL.ts 13 additions, 3 deletions

app/lib/dal/fileDAL.ts
app/lib/logger.ts 6 additions, 0 deletions

app/lib/logger.ts
app/modules/prover/lib/blockGenerator.ts 1 addition, 1 deletion

app/modules/prover/lib/blockGenerator.ts
bin/duniter 13 additions, 12 deletions

bin/duniter
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

with 38 additions and 21 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