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
..
util	Don't hide potential timeline bugs by catching all exceptions (#2372)	2022-03-08 21:39:59 +01:00
viewmodel	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
TimelineFragment.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
TimelinePagingAdapter.kt	Fix status diffing and improve timeline performance (#2386)	2022-03-15 21:34:57 +01:00
TimelineTypeMappers.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00