prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel' into feature/kitsu

Browse Source 
# Conflicts:
#	app/src/main/kotlin/org/koitharu/kotatsu/core/prefs/AppSettings.kt
#	app/src/main/res/values/strings.xml
This commit is contained in:
Zakhar Timoshenko
2023-05-29 17:29:05 +03:00
parent 56de725cf1 5a0c54e00f
commit 6fdcaf0d02
921 changed files with 14609 additions and 12719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/res/xml/pref_services.xml
View File

@@ -10,6 +10,12 @@
android:summary="@string/sync_title"
android:title="@string/sync" />
<PreferenceScreen
android:enabled="false"
android:fragment="org.koitharu.kotatsu.settings.SyncSettingsFragment"
android:key="sync_settings"
android:title="@string/sync_settings" />
<PreferenceCategory android:title="@string/tracking">
<Preference