Zakhar Timoshenko ee2538ba7f Merge branch 'devel' into feature/mal ...

# Conflicts:
#	app/src/main/java/org/koitharu/kotatsu/core/prefs/AppSettings.kt
#	app/src/main/java/org/koitharu/kotatsu/scrobbling/ScrobblingModule.kt
#	app/src/main/java/org/koitharu/kotatsu/scrobbling/domain/model/ScrobblerService.kt
#	app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
#	app/src/main/res/xml/pref_history.xml

2023-01-30 00:53:13 +03:00

..

libs

…

sampledata

Using custom sample data

2022-08-07 21:29:37 +03:00

src

Merge branch 'devel' into feature/mal

2023-01-30 00:53:13 +03:00

.gitignore

…

build.gradle

Merge branch 'devel' into feature/anilist

2023-01-27 19:38:00 +02:00

proguard-rules.pro

Content prefetch settings

2023-01-09 10:49:25 +02:00