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
..
dialog	refactor compose & announcements to coroutines (#2446)	2022-04-21 18:46:21 +02:00
view	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-01 19:54:22 +09:00
ComposeActivity.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
ComposeAutoCompleteAdapter.kt	modernize autocomplete (#2510)	2022-05-17 19:55:37 +02:00
ComposeTokenizer.kt	modernize autocomplete (#2510)	2022-05-17 19:55:37 +02:00
ComposeViewModel.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
ImageDownsizer.kt	refactor compose & announcements to coroutines (#2446)	2022-04-21 18:46:21 +02:00
MediaPreviewAdapter.kt	Ability to crop images attached to posts (#2531)	2022-05-22 21:01:14 +02:00
MediaUploader.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00