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

323a47d2

Commit 323a47d2 authored 9 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '224-duplicate-contacts' into 'master'

Allow multiple identities to have the same contact. #224



See merge request !82

parents e1ba1465 0fd8a67e

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

briar-core/src/org/briarproject/db/Database.java 4 additions, 2 deletions

briar-core/src/org/briarproject/db/Database.java
briar-core/src/org/briarproject/db/DatabaseComponentImpl.java 2 additions, 2 deletions

...r-core/src/org/briarproject/db/DatabaseComponentImpl.java
briar-core/src/org/briarproject/db/JdbcDatabase.java 6 additions, 4 deletions

briar-core/src/org/briarproject/db/JdbcDatabase.java
briar-tests/src/org/briarproject/db/DatabaseComponentImplTest.java 4 additions, 7 deletions

...ts/src/org/briarproject/db/DatabaseComponentImplTest.java

with 16 additions and 15 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