kyori19 eeb6c3c96b Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/MainActivity.kt # app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java # app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java # app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt # 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/search/SearchViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/TimelineViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt # app/src/main/java/com/keylesspalace/tusky/db/TimelineStatusEntity.kt # app/src/main/java/com/keylesspalace/tusky/di/NetworkModule.kt # app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java # app/src/main/java/com/keylesspalace/tusky/service/SendStatusService.kt # app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java # app/src/main/res/layout/item_status_detailed.xml # app/src/main/res/values-cy/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-fa/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-nb-rNO/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values/strings.xml # fastlane/metadata/android/sv/changelogs/74.txt # fastlane/metadata/android/tr/changelogs/58.txt # gradle/libs.versions.toml		2023-01-29 04:44:17 +09:00
..
ActivitiesModule.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-12-29 22:53:20 +09:00
AppComponent.kt	Cleanup dagger setup (#2300)	2022-01-23 20:24:55 +01:00
AppInjector.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
AppModule.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
BroadcastReceiverModule.kt	Push notifications support via UnifiedPush (#2303)	2022-05-17 19:32:09 +02:00
FragmentBuildersModule.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
Injectable.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
NetworkModule.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
ServicesModule.kt	Rename Toots to Posts (#2396)	2022-03-20 20:21:42 +01:00
ViewModelFactory.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00