Merge branch 'dev' into ns15

This commit is contained in:
Milos Kozak 2023-02-11 16:57:16 +01:00
commit 8f9dfe4ddc

View file

@ -8,15 +8,19 @@
<activity <activity
android:name=".ui.wizard.activation.ErosPodActivationWizardActivity" android:name=".ui.wizard.activation.ErosPodActivationWizardActivity"
android:exported="false" /> android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
android:name=".ui.wizard.deactivation.ErosPodDeactivationWizardActivity" android:name=".ui.wizard.deactivation.ErosPodDeactivationWizardActivity"
android:exported="false" /> android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
android:name=".ui.ErosPodManagementActivity" android:name=".ui.ErosPodManagementActivity"
android:exported="false" /> android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
<activity <activity
android:name=".ui.ErosPodHistoryActivity" android:name=".ui.ErosPodHistoryActivity"
android:exported="false" /> android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
</application> </application>
</manifest> </manifest>