Merge branch 'main' into develop

# Conflicts: # app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationsViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt
tuskyapp · Jan 17, 2025 · 9d1a4bc · 9d1a4bc
2 parents 3db8e0b + 280f2f0
commit 9d1a4bc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@
 
 ### Significant bug fixes
 
+## v27.2
+
+### Significant bug fixes
+
+- The title of a hashtag tab now shows the actual hashtags again (instead of just "Hashtags") https://github.com/tuskyapp/Tusky/pull/4868
+- Makes sure the background color of a dialogs is correct https://github.com/tuskyapp/Tusky/pull/4864
+- Fixes an issue where Tusky would freeze while loading a timeline gap https://github.com/tuskyapp/Tusky/pull/4865
+
 ## v27.1
 
 ### New features and other improvements

diff --git a/app/build.gradle b/app/build.gradle
@@ -29,8 +29,8 @@ android {
         namespace "com.keylesspalace.tusky"
         minSdk 24
         targetSdk 34
-        versionCode 128
-        versionName "27.1"
+        versionCode 129
+        versionName "27.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 

diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/01_timeline.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/01_timeline.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/03_profile.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/03_profile.png