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

eeea427f

Commit eeea427f authored 8 years ago by Cédric Moreau

Downloads
- Plain Diff

Merge branch '0.80' into dev

parents c457a1b1 7cf5b121

No related branches found

No related tags found

Loading

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

app/lib/computation/blockchainContext.js 99 additions, 97 deletions

app/lib/computation/blockchainContext.js
app/lib/dal/sqliteDAL/index/CIndexDAL.js 1 addition, 1 deletion

app/lib/dal/sqliteDAL/index/CIndexDAL.js
appveyor.yml 1 addition, 1 deletion

appveyor.yml
ci/travis/before_deploy.sh 1 addition, 1 deletion

ci/travis/before_deploy.sh
ci/travis/debian/DEBIAN/control 1 addition, 1 deletion

ci/travis/debian/DEBIAN/control
gui/index.html 1 addition, 1 deletion

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

gui/package.json
install.sh 1 addition, 1 deletion

install.sh
package.json 1 addition, 1 deletion

package.json
test/integration/branches.js 1 addition, 1 deletion

test/integration/branches.js

with 109 additions and 107 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