You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		3 years ago
..
libs	Add Chucker for debug	6 years ago
sampledata	Using custom sample data	4 years ago
src	Merge branch 'devel' into feature/mal	3 years ago
.gitignore	Update history	6 years ago
build.gradle	Merge branch 'devel' into feature/anilist	3 years ago
proguard-rules.pro	Content prefetch settings	3 years ago