mirrors/Plume
1
0
Fork 0
mirror of https://git.joinplu.me/Plume/Plume.git synced 2024-11-29 06:51:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Move local timeline before federated timeline' (#1070) from timeline-order into main

Browse source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1070
This commit is contained in:
KitaitiMakoto 2022-05-07 03:25:01 +00:00
commit 156a875f02
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
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

2
plume-models/src/timeline/mod.rs
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