kyori19 e5d9b56dd0 Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingFragment.kt # app/src/main/java/com/keylesspalace/tusky/entity/Status.kt # app/src/main/res/values-be/strings.xml # app/src/main/res/values-cy/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-gd/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-lv/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-sv/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values/donottranslate.xml # fastlane/metadata/android/en-US/images/phoneScreenshots/01_timeline.png # fastlane/metadata/android/en-US/images/phoneScreenshots/03_profile.png # fastlane/metadata/android/en-US/images/phoneScreenshots/04_favourites.png # fastlane/metadata/android/fa/full_description.txt # fastlane/metadata/android/sv/changelogs/58.txt # fastlane/metadata/android/sv/changelogs/67.txt # fastlane/metadata/android/sv/changelogs/72.txt # fastlane/metadata/android/sv/changelogs/77.txt # gradle/libs.versions.toml		2023-07-19 21:14:48 +09:00
..
account	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
accountlist	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
announcements	Merge remote-tracking branch 'tuskyapp/develop'	2023-06-02 00:54:05 +09:00
compose	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
conversation	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
drafts	update ktlint plugin to 11.3.1, format code (#3442)	2023-03-13 13:16:39 +01:00
filters	Add delete button to edit filter activity. (#3553)	2023-06-11 19:59:26 +02:00
followedtags	Simplify repeated code that shows errors (#3762)	2023-06-19 23:49:20 +02:00
instanceinfo	Merge remote-tracking branch 'tuskyapp/develop'	2022-11-12 04:35:49 +09:00
instancemute	Simplify repeated code that shows errors (#3762)	2023-06-19 23:49:20 +02:00
login	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
notifications	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
preference	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
report	Merge remote-tracking branch 'tuskyapp/develop'	2023-06-02 00:54:05 +09:00
scheduled	Simplify repeated code that shows errors (#3762)	2023-06-19 23:49:20 +02:00
search	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
timeline	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00
trending	Check for empty trending response (#3853)	2023-07-19 09:39:07 +02:00
viewthread	Merge remote-tracking branch 'tuskyapp/develop'	2023-07-19 21:14:48 +09:00