diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-13 16:06:49 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-13 16:06:49 +0100 |
| commit | a41e0b0f7ec0cff1dc7a34b42d663c777a317e61 (patch) | |
| tree | eba639ead30462f595614677a8358e972fd4cef1 /app/src/main/AndroidManifest.xml | |
| parent | fecdec8975042d0ae27efe63e8cefc7415ca5ad6 (diff) | |
| parent | 9b6c368a25510c462ea357121c97edb6d0310021 (diff) | |
Merge branch 'origin_0.9.8' into #8831_progress_animation_when_connecting
* added new EipCommand in StartActivity
* added option to add intent extras to EipCommand
* resolved merge conflicts and minor refactorings in:
app/src/main/java/se/leap/bitmaskclient/EipFragment.java
app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 029e9fdb..f60a2db6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,7 @@ <uses-sdk android:minSdkVersion="16" - android:targetSdkVersion="26" /> + android:targetSdkVersion="27" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> |