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
..
AccountListFragment.kt	Fix status diffing and improve timeline performance (#2386)	2022-03-15 21:34:57 +01:00
NotificationsFragment.java	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
SFragment.java	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
ViewImageFragment.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
ViewMediaFragment.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
ViewThreadFragment.java	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
ViewVideoFragment.kt	Audio caption improvements (#2220)	2021-09-17 21:55:54 +02:00