Merge branch 'main' into sleep-broadcasting

This commit is contained in:
KitaitiMakoto 2022-05-07 03:27:53 +00:00
commit aa3e4d7cf8
2 changed files with 3 additions and 1 deletions

View File

@ -11,6 +11,8 @@
### Changed ### Changed
- Bump Rust to nightly 2022-01-26 (#1015) - Bump Rust to nightly 2022-01-26 (#1015)
- Remove "Latest articles" timeline (#1069)
- Change order of timeline tabs (#1069, #1070)
### Fixed ### Fixed

View File

@ -91,7 +91,7 @@ impl Timeline {
if t1.user_id.is_some() && t2.user_id.is_none() { if t1.user_id.is_some() && t2.user_id.is_none() {
Ordering::Less Ordering::Less
} else { } else {
Ordering::Equal t1.id.cmp(&t2.id)
} }
}); });
timelines timelines