kyori19 eeb6c3c96b Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/MainActivity.kt # app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java # app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java # app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt # 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/compose/MediaUploader.kt # app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt # app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt # app/src/main/java/com/keylesspalace/tusky/di/NetworkModule.kt # app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java # app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt # app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java # app/src/main/res/layout/item_status_detailed.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-fa/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-nb-rNO/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values/strings.xml # fastlane/metadata/android/sv/changelogs/74.txt # fastlane/metadata/android/tr/changelogs/58.txt # gradle/libs.versions.toml		2023-01-29 04:44:17 +09:00
..
account	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
announcements	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
compose	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
conversation	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
drafts	Fix saving changes to statuses when editing (#3103)	2022-12-31 13:04:49 +01:00
followedtags	Add view for browsing and unfollowing followed hashtags (#2794)	2022-12-01 19:24:27 +01:00
instanceinfo	Merge remote-tracking branch 'tuskyapp/develop'	2022-11-12 04:35:49 +09:00
instancemute	Fix toolbar for instance list activity. (#2248)	2021-09-28 19:55:30 +02:00
login	Merge remote-tracking branch 'tuskyapp/develop'	2022-11-12 04:35:49 +09:00
notifications	Respect "Always expand posts marked with content warnings" pref in notifications (#3154)	2023-01-12 19:40:01 +01:00
preference	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
report	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
scheduled	Fix saving changes to statuses when editing (#3103)	2022-12-31 13:04:49 +01:00
search	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
timeline	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
viewthread	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00