Merge pull request 'Move local timeline before federated timeline' (#1070) from timeline-order into main
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1070
This commit is contained in:
commit
156a875f02
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user