kyori19 4f705ae074 Merge remote-tracking branch 'tuskyapp/main' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt		2023-06-10 01:02:01 +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	Save the a copy of the notification marker ID locally (#3672)	2023-05-18 23:23:42 +02:00
AccountManager.kt	Write notification account information to the correct account (#3697)	2023-06-01 19:19:18 +02:00
AppDatabase.java	Merge remote-tracking branch 'tuskyapp/develop'	2023-06-02 00:54:05 +09:00
ConversationsDao.kt	Fix conversations (#2556)	2022-05-30 19:06:14 +02:00
Converters.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-06-02 00:54:05 +09:00
DraftDao.kt	Fix DraftDao queries on older SQLite (#3231)	2023-01-28 12:40:46 +01:00
DraftEntity.kt	update ktlint plugin to 11.3.1, format code (#3442)	2023-03-13 13:16:39 +01:00
DraftsAlert.kt	Code cleanups (#3264)	2023-02-20 19:58:37 +01:00
InstanceDao.kt	Upgrade AndroidX dependencies (#3169)	2023-02-04 20:22:29 +01: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-06-02 00:54:05 +09:00
TimelineStatusEntity.kt	Merge remote-tracking branch 'tuskyapp/develop'	2023-06-02 00:54:05 +09:00