kyori19 57aab71b0e Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt # app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java # 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/conversation/ConversationViewHolder.java # app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt # app/src/main/res/layout/activity_main.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-fa/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-no-rNB/strings.xml # app/src/main/res/values-zh-rCN/strings.xml		2022-07-16 02:51:51 +09:00
..
actions.xml	Add "more" popup to a11y menu, fix #1710 (#1714)	2020-03-02 19:36:44 +01:00
attrs.xml	Merge commit '224161caf111a15887cbc8a419763e87fe69931d'	2022-03-04 00:37:23 +09:00
colors.xml	Merge remote-tracking branch 'tuskyapp/develop'	2022-04-13 00:59:06 +09:00
dimens.xml	Drafts v2 (#2032)	2021-01-21 18:57:09 +01:00
donottranslate.xml	Merge commit '0f1e95d0ca81d0254f8d1ae6b60a3130d51b15cf'	2022-05-19 00:15:17 +09:00
ic_launcher_background.xml	[rebrand] Rebrand to Yuito	2019-09-05 21:29:45 +09:00
ids.xml	Add ability to pin/unpin statuses (#872)	2018-10-03 21:27:52 +02:00
integers.xml	cleanup unused resources (#1300)	2019-06-02 22:02:03 +02:00
string-arrays.xml	Replace “status” by “post” in strings name and source values (#2405)	2022-03-27 12:23:25 +02:00
strings.xml	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
styles.xml	Merge remote-tracking branch 'tuskyapp/develop'	2022-04-13 00:59:06 +09:00
theme_colors.xml	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-01 19:54:22 +09:00
toot_button.xml	Upgrade to AndroidX, move to MaterialComponents theme (#953)	2018-12-17 15:25:35 +01:00