kyori19 25bee533f1 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/entity/Account.kt # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml		2022-05-19 02:42:27 +09:00
..
FilterModel.kt	filter messages by also looking at media descriptions (#2285)	2022-01-04 19:28:49 +01:00
InstanceSwitchAuthInterceptor.java	Upgrade to AndroidX, move to MaterialComponents theme (#953)	2018-12-17 15:25:35 +01:00
MastodonApi.kt	modernize autocomplete (#2510)	2022-05-17 19:55:37 +02:00
MediaUploadApi.kt	increase timeout for media uploads (#2489)	2022-05-01 17:16:22 +02:00
NotestockApi.kt	Merge remote-tracking branch 'tuskyapp/develop'	2021-07-03 23:59:57 +09:00
ProgressRequestBody.java	Upgrade to AndroidX, move to MaterialComponents theme (#953)	2018-12-17 15:25:35 +01:00
TimelineCases.kt	Cleanup dagger setup (#2300)	2022-01-23 20:24:55 +01:00