Merge branch '474-alice-flag' into 'master' (79d6fd28) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

79d6fd28

Commit 79d6fd28 authored 6 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '474-alice-flag' into 'master'

IntroduceeProtocolEngine uses wrong role when adding keys

See merge request akwizgran/briar!780

parents d7492df8 68132d89

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/contact/ContactManager.java 6 additions, 1 deletion

.../org/briarproject/bramble/api/contact/ContactManager.java
bramble-api/src/main/java/org/briarproject/bramble/api/transport/KeyManager.java 5 additions, 1 deletion

...va/org/briarproject/bramble/api/transport/KeyManager.java
briar-core/src/main/java/org/briarproject/briar/introduction/IntroduceeProtocolEngine.java 1 addition, 1 deletion

...rproject/briar/introduction/IntroduceeProtocolEngine.java

with 12 additions and 3 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