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
..
FilterModel.kt	update ktlint plugin to 11.3.1, format code (#3442)	2023-03-13 13:16:39 +01:00
InstanceSwitchAuthInterceptor.kt	update ktlint plugin to 11.3.1, format code (#3442)	2023-03-13 13:16:39 +01:00
MastodonApi.kt	Fetch all outstanding Mastodon notifications when creating Android notifications (#3700)	2023-06-01 19:31:30 +02:00
MediaUploadApi.kt	Handoff media upload (#2947)	2022-12-29 19:58:23 +01:00
NotestockApi.kt	Apply ktlint and add to CI	2022-11-12 04:36:13 +09:00
ProgressRequestBody.java	Always publish image alt text	2023-04-24 11:48:40 +02:00