(cherry picked from commit b3f5f13c39ace3554396e084c7686e731db98141) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit b3f5f13c39ace3554396e084c7686e731db98141) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||