|
|
875013e47f
|
Merge tag 'v25.2' into develop
# Conflicts:
# README.md
# app/build.gradle
# app/lint-baseline.xml
# app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsFragment.kt
# app/src/main/java/com/keylesspalace/tusky/components/notifications/StatusNotificationViewHolder.kt
# app/src/main/java/com/keylesspalace/tusky/components/preference/PreferencesFragment.kt
# app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.kt
# app/src/main/res/layout/activity_about.xml
# app/src/main/res/layout/item_emoji_pref.xml
# app/src/main/res/values-ar/strings.xml
# app/src/main/res/values-bg/strings.xml
# app/src/main/res/values-cy/strings.xml
# app/src/main/res/values-de/strings.xml
# app/src/main/res/values-fa/strings.xml
# app/src/main/res/values-gd/strings.xml
# app/src/main/res/values-gl/strings.xml
# app/src/main/res/values-hu/strings.xml
# app/src/main/res/values-is/strings.xml
# app/src/main/res/values-it/strings.xml
# app/src/main/res/values-ja/strings.xml
# app/src/main/res/values-nl/strings.xml
# app/src/main/res/values-oc/strings.xml
# app/src/main/res/values-pt-rBR/strings.xml
# app/src/main/res/values-pt-rPT/strings.xml
# app/src/main/res/values-ru/strings.xml
# app/src/main/res/values-si/strings.xml
# app/src/main/res/values-sv/strings.xml
# app/src/main/res/values-tr/strings.xml
# app/src/main/res/values-uk/strings.xml
# app/src/main/res/values-vi/strings.xml
# app/src/main/res/values-zh-rCN/strings.xml
# app/src/main/res/values/strings.xml
# fastlane/metadata/android/ru/full_description.txt
# fastlane/metadata/android/zh-Hans/full_description.txt
|
2026-01-02 18:27:41 +11:00 |
|
