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
..
src	Merge remote-tracking branch 'origin/release'	2023-04-16 17:41:19 -04:00
.gitignore	Move google-services.json	2020-04-29 17:56:05 -04:00
build.gradle.kts	Merge remote-tracking branch 'origin/release'	2023-04-16 17:41:19 -04:00
proguard-android-optimize.txt	Proguard fixes	2021-05-22 16:07:11 -04:00
proguard-rules.pro	Don't optimize out serializers	2023-03-16 17:22:52 -04:00