Merge remote-tracking branch 'origin/master'

# Conflicts: # app/src/main/res/layout/viewpager_items.xml
2024-12-14 17:56:33 +05:30
parent f6ba65a4c0 43ac68f42b
commit c930212db2
3 changed files with 0 additions and 54 deletions
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,9 +40,6 @@
        <activity
            android:name=".activities.SetupPasswordActivity"
            android:exported="false" />
-        <activity
-            android:name=".activities.SplashActivity"
-            android:exported="true"/>

        <activity
            android:name=".activities.MainActivity"