diff options
| author | cyberta <cyberta@riseup.net> | 2018-02-10 12:11:25 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2018-02-10 12:11:25 -0800 |
| commit | b37575a680cd1e345339bdc5c4c4bc1137b2e4f1 (patch) | |
| tree | c6708bbcf23c1930d045beee6c46d7c74752e9a6 /app/src/main/AndroidManifest.xml | |
| parent | a75de0157b7f80de4526d9ac57a96ecb6e8fa45e (diff) | |
| parent | 69cd8480df05055e8b068bbff563c17d6feb86dd (diff) | |
Merge branch '8554_error_array' into '0.9.8'
#8554
See merge request leap/bitmask_android!41
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6a1d40aa..029e9fdb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -102,10 +102,8 @@ android:label="@string/provider_details_title" android:launchMode="singleTop" /> - <activity android:name=".LoginActivity" - android:noHistory="true" /> - <activity android:name=".SignupActivity" - android:noHistory="true" /> + <activity android:name=".LoginActivity" /> + <activity android:name=".SignupActivity" /> <service android:name=".eip.EIP" |