Jobobby04 641cc942cb Merge remote-tracking branch 'origin/release' ... # Conflicts: # app/build.gradle.kts # app/src/main/java/eu/kanade/presentation/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt # app/src/main/java/eu/kanade/tachiyomi/App.kt # app/src/main/java/eu/kanade/tachiyomi/data/download/Downloader.kt # app/src/main/java/eu/kanade/tachiyomi/source/AndroidSourceManager.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt # app/src/main/java/exh/recs/RecommendsScreenModel.kt # core/src/main/java/eu/kanade/tachiyomi/network/interceptor/UncaughtExceptionInterceptor.kt # domain/src/main/java/tachiyomi/domain/updates/interactor/GetUpdates.kt		2023-04-16 17:41:19 -04:00
..
java	Directly use shortcuts and update google services and firebase	2023-04-16 17:14:59 -04:00
res	Merge remote-tracking branch 'origin/release'	2023-04-16 17:41:19 -04:00
AndroidManifest.xml	Convert BackupRestoreService to a WorkManager job	2023-03-20 18:42:05 -04:00
baseline-prof.txt	Get baseline profiles working	2023-04-16 16:15:26 -04:00
ic_launcher-web.png	Merge remote-tracking branch 'upstream/master'	2018-01-29 12:16:32 -05:00