Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Dunitrust
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

c84ff91c

Commit c84ff91c authored 7 years ago by nanocryk

Downloads
- Plain Diff

Merge branch 'dev' into 'ci'

# Conflicts:
#   keys/ed25519.rs
#   keys/lib.rs

parents f7479f0e f072fe69

No related branches found

No related tags found

1 merge request!6Apply rustfmt diff in gitlab-CI

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

Cargo.lock 50 additions, 53 deletions

Cargo.lock
keys/Cargo.toml 1 addition, 1 deletion

keys/Cargo.toml
keys/ed25519.rs 0 additions, 20 deletions

keys/ed25519.rs
keys/lib.rs 5 additions, 25 deletions

keys/lib.rs

with 56 additions and 99 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