Merge branch 'devel' into feature/nextgen

# Conflicts:
#	app/src/main/java/org/koitharu/kotatsu/reader/ui/ReaderActivity.kt
#	app/src/main/res/values/strings.xml
This commit is contained in:
Zakhar Timoshenko
2022-07-20 21:39:43 +03:00
17 changed files with 362 additions and 326 deletions

View File

@@ -357,4 +357,5 @@
<string name="removed_from_favourites">Removed from favourites</string>
<string name="removed_from_s">Removed from \"%s\"</string>
<string name="options">Options</string>
<string name="not_found_404">Content not found or removed</string>
</resources>