(cherry picked from commit 073e9f94ff06a538c4aa06aa3db0ac1a6cf5be5b) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt |
||
|---|---|---|
| .. | ||
| src/main | ||
| .gitignore | ||
| build.gradle.kts | ||
(cherry picked from commit 073e9f94ff06a538c4aa06aa3db0ac1a6cf5be5b) # Conflicts: # core/src/main/java/eu/kanade/tachiyomi/network/OkHttpExtensions.kt |
||
|---|---|---|
| .. | ||
| src/main | ||
| .gitignore | ||
| build.gradle.kts | ||