Zakhar Timoshenko 6fdcaf0d02 Merge branch 'devel' into feature/kitsu ...

# Conflicts:
#	app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
#	app/src/main/res/values/strings.xml

2023-05-29 17:29:05 +03:00

..

libs

…

src

Merge branch 'devel' into feature/kitsu

2023-05-29 17:29:05 +03:00

.gitignore

…

build.gradle

Merge branch 'master' into devel

2023-05-23 13:34:29 +03:00

proguard-rules.pro

Refactoring

2023-05-19 14:19:02 +03:00