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.
Kotatsu/app
Zakhar Timoshenko 2c71110fa5 Merge branch 'devel' into feature/mal
# Conflicts:
#	app/src/main/java/org/koitharu/kotatsu/settings/HistorySettingsFragment.kt
#	app/src/main/res/values/strings.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 Bump version 3 years ago
proguard-rules.pro Merge branch 'master' into devel 4 years ago