diff options
| author | cyberta <cyberta@riseup.net> | 2022-07-19 17:26:25 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-07-19 17:26:25 +0000 |
| commit | 6bc3a79e6d09a8fa1857f1d502a87c1c0633be35 (patch) | |
| tree | 7aa914e63bb6aae27c8521dd198e3f7416e9890c /app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java | |
| parent | abd8c8d06f01cc5b794a18779c2ea36b9317b4e3 (diff) | |
| parent | 4a95fbad79333bc1cc83b22c8122293a3d8d332f (diff) | |
Merge branch 'integrate_obfsvpn' into 'master'
update bitmaskcore, integrating obfsvpn
See merge request leap/bitmask_android!190
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java index 1c859d65..c5593bf7 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/NavigationDrawerFragment.java @@ -32,7 +32,6 @@ import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; -import androidx.annotation.StringRes; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AlertDialog; |