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:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user