From f401949037dd0e16002c9cb3c62d360beac45d66 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sat, 7 May 2022 04:43:00 +0900
Subject: [PATCH 1/2] Move local timeline before federated timeline

---
 plume-models/src/timeline/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plume-models/src/timeline/mod.rs b/plume-models/src/timeline/mod.rs
index 8f80310c..e1f4c2e2 100644
--- a/plume-models/src/timeline/mod.rs
+++ b/plume-models/src/timeline/mod.rs
@@ -91,7 +91,7 @@ impl Timeline {
                         if t1.user_id.is_some() && t2.user_id.is_none() {
                             Ordering::Less
                         } else {
-                            Ordering::Equal
+                            t1.id.cmp(&t2.id)
                         }
                     });
                     timelines

From c1c606bc86aa36417e1756f6243ed5e0dc9548e8 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sat, 7 May 2022 04:46:28 +0900
Subject: [PATCH 2/2] [skip ci]Add changelog about timeline order change

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df7324a1..c317352d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@
 ### Changed
 
 - Bump Rust to nightly 2022-01-26 (#1015)
+- Remove "Latest articles" timeline (#1069)
+- Change order of timeline tabs (#1069, #1070)
 
 ### Fixed