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
..
dialog	refactor compose & announcements to coroutines (#2446)	2022-04-21 18:46:21 +02:00
view	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-01 19:54:22 +09:00
ComposeActivity.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-19 02:42:27 +09:00
ComposeAutoCompleteAdapter.kt	modernize autocomplete (#2510)	2022-05-17 19:55:37 +02:00
ComposeTokenizer.kt	modernize autocomplete (#2510)	2022-05-17 19:55:37 +02:00
ComposeViewModel.kt	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-19 02:42:27 +09:00
ImageDownsizer.kt	refactor compose & announcements to coroutines (#2446)	2022-04-21 18:46:21 +02:00
MediaPreviewAdapter.kt	add ktlint plugin to project and apply default code style (#2209)	2021-06-28 21:13:24 +02:00
MediaUploader.kt	Merge commit '0f1e95d0ca81d0254f8d1ae6b60a3130d51b15cf'	2022-05-19 00:15:17 +09:00