Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

bitmask_android
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

1867fe85

Commit 1867fe85 authored 3 years ago by cyberta

Downloads
- Plain Diff

Merge branch 'update_AboutActivity' into 'master'

Update about activity

See merge request !169

parents e631257d d38459d4

No related branches found

No related tags found

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

app/src/main/java/de/blinkt/openvpn/core/connection/Obfs4Connection.java 3 additions, 2 deletions

...va/de/blinkt/openvpn/core/connection/Obfs4Connection.java
app/src/main/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java 2 additions, 2 deletions

...in/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java
app/src/main/java/se/leap/bitmaskclient/pluggableTransports/BinaryInstaller.java 0 additions, 204 deletions

...ap/bitmaskclient/pluggableTransports/BinaryInstaller.java
app/src/main/java/se/leap/bitmaskclient/pluggableTransports/Dispatcher.java 0 additions, 216 deletions

...se/leap/bitmaskclient/pluggableTransports/Dispatcher.java
app/src/main/res/layout-xlarge/f_about.xml 63 additions, 14 deletions

app/src/main/res/layout-xlarge/f_about.xml
app/src/main/res/layout/f_about.xml 44 additions, 15 deletions

app/src/main/res/layout/f_about.xml
app/src/main/res/values/untranslatable.xml 15 additions, 7 deletions

app/src/main/res/values/untranslatable.xml

with 127 additions and 460 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