merge (5d8ba660) · 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

5d8ba660

Unverified Commit 5d8ba660 authored 9 years ago by Ernir Erlingsson

Downloads
- Patches
- Plain Diff

merge

parent a9de1252

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/org/briarproject/android/ActivityComponent.java 17 additions, 5 deletions

...droid/src/org/briarproject/android/ActivityComponent.java
briar-android/src/org/briarproject/android/ActivityModule.java 19 additions, 0 deletions

...-android/src/org/briarproject/android/ActivityModule.java
briar-android/src/org/briarproject/android/AndroidComponent.java 27 additions, 58 deletions

...ndroid/src/org/briarproject/android/AndroidComponent.java
briar-android/src/org/briarproject/android/contact/ContactListFragment.java 1 addition, 15 deletions

...org/briarproject/android/contact/ContactListFragment.java
briar-android/src/org/briarproject/android/keyagreement/ChooseIdentityFragment.java 4 additions, 10 deletions

...rproject/android/keyagreement/ChooseIdentityFragment.java
briar-android/src/org/briarproject/android/keyagreement/KeyAgreementActivity.java 4 additions, 3 deletions

...iarproject/android/keyagreement/KeyAgreementActivity.java
briar-android/src/org/briarproject/android/keyagreement/ShowQrCodeFragment.java 3 additions, 10 deletions

...briarproject/android/keyagreement/ShowQrCodeFragment.java

with 75 additions and 101 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