Skip to content

Commit 8855545

Browse files
committed
Merge branch 'nav3-migration' into nav3-migration-add-subscription-activity
2 parents 55014e6 + 3c39b00 commit 8855545

3 files changed

Lines changed: 12 additions & 0 deletions

File tree

app/src/main/java/at/bitfire/icsdroid/MainActivity.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
3+
*/
4+
15
package at.bitfire.icsdroid
26

37
import android.os.Bundle

app/src/main/java/at/bitfire/icsdroid/ui/nav/Destination.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
3+
*/
4+
15
package at.bitfire.icsdroid.ui.nav
26

37
import androidx.annotation.ColorInt

app/src/main/java/at/bitfire/icsdroid/ui/nav/MainApp.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
3+
*/
4+
15
package at.bitfire.icsdroid.ui.nav
26

37
import android.accounts.AccountManager

0 commit comments

Comments
 (0)