Merge branch 'main' into sleep-broadcasting

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
 

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