kyori19 57aab71b0e Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt # app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java # 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/conversation/ConversationViewHolder.java # app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt # app/src/main/res/layout/activity_main.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-fa/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-no-rNB/strings.xml # app/src/main/res/values-zh-rCN/strings.xml		2022-07-16 02:51:51 +09:00
..
ConversationAdapter.kt	Fix conversations (#2556)	2022-05-30 19:06:14 +02:00
ConversationEntity.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
ConversationLoadStateAdapter.kt	Fix conversations (#2556)	2022-05-30 19:06:14 +02:00
ConversationViewData.kt	Fix conversations (#2556)	2022-05-30 19:06:14 +02:00
ConversationViewHolder.java	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
ConversationsFragment.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
ConversationsRemoteMediator.kt	Fix conversations (#2556)	2022-05-30 19:06:14 +02:00
ConversationsViewModel.kt	improve logout (#2579)	2022-06-20 16:45:54 +02:00