(cherry picked from commit 2b9acadc5b7e418f41fa6f93a29a005d671598ee) # Conflicts: # app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt |
||
|---|---|---|
| .. | ||
| java/tachiyomi/data | ||
| sqldelight/tachiyomi | ||
| AndroidManifest.xml | ||
(cherry picked from commit 2b9acadc5b7e418f41fa6f93a29a005d671598ee) # Conflicts: # app/src/main/java/eu/kanade/data/source/SourceRepositoryImpl.kt |
||
|---|---|---|
| .. | ||
| java/tachiyomi/data | ||
| sqldelight/tachiyomi | ||
| AndroidManifest.xml | ||