(cherry picked from commit 161c8bcf9e4d2604ddf99645045b74908ec9b0a2) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-android-optimize.txt | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||
(cherry picked from commit 161c8bcf9e4d2604ddf99645045b74908ec9b0a2) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/AppModule.kt |
||
|---|---|---|
| .. | ||
| src | ||
| .gitignore | ||
| build.gradle.kts | ||
| proguard-android-optimize.txt | ||
| proguard-rules.pro | ||
| shortcuts.xml | ||