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
..
components/timeline	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
db	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
json	use custom JsonAdapter to be compatible with instances that have a custom subscribing feature (#2298)	2022-01-21 07:34:26 +01:00
network	add test for InstanceSwitchAuthInterceptor and convert it to Kotlin (#2596)	2022-06-30 21:25:44 +02:00
util	Fix tests	2022-05-19 00:49:57 +09:00
BottomSheetActivityTest.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
ComposeActivityTest.kt	improve logout (#2579)	2022-06-20 16:45:54 +02:00
ComposeTokenizerTest.kt	modernize autocomplete (#2510)	2022-05-17 19:55:37 +02:00
FilterTest.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
FocalPointUtilTest.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
SpanUtilsTest.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
StatusComparisonTest.kt	move Html parsing to ViewData (#2414)	2022-04-15 13:20:27 +02:00
StringUtilsTest.kt	Fix Timeline not loading (#2398)	2022-03-28 18:39:16 +02:00
TuskyApplication.kt	New emoji picker (#2395)	2022-04-26 18:50:58 +02:00