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
..
AccountDao.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
AccountEntity.kt	Respect "Always expand posts marked with content warnings" pref in notifications (#3154)	2023-01-12 19:40:01 +01:00
AccountManager.kt	Language selection fixes (#2917)	2022-11-24 15:45:19 +01:00
AppDatabase.java	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
ConversationsDao.kt	Fix conversations (#2556)	2022-05-30 19:06:14 +02:00
Converters.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
DraftDao.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
DraftEntity.kt	Add post editing capability (#2828)	2022-12-08 10:18:12 +01:00
InstanceDao.kt	fix caching of instance defaults and emojis (#2643)	2022-08-07 22:18:53 +02:00
InstanceEntity.kt	Handle even more instance defaults (#2612)	2022-07-26 20:24:50 +02:00
TimelineDao.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00
TimelineStatusEntity.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-01-29 04:44:17 +09:00