Merge branch '845-wifi-without-internet' into 'master' (4a892acd) · 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

4a892acd

Verified Commit 4a892acd authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '845-wifi-without-internet' into 'master'

Looks like I added the last commit after the MR was merged.

parents 309c7a46 bdb518ff

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/src/main/java/org/briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java 36 additions, 0 deletions

.../briarproject/bramble/plugin/tcp/AndroidLanTcpPlugin.java
bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java 2 additions, 1 deletion

...ava/org/briarproject/bramble/plugin/tcp/LanTcpPlugin.java
bramble-core/src/main/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java 6 additions, 1 deletion

...n/java/org/briarproject/bramble/plugin/tcp/TcpPlugin.java

with 44 additions and 2 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