| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2020-09-08 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/api/v1/timelines/public_controller.rb - app/lib/feed_manager.rb - app/models/status.rb - app/services/precompute_feed_service.rb - app/workers/feed_insert_worker.rb - spec/models/status_spec.rb All conflicts are due to upstream refactoring feed management and us having local-only toots on top of that. Rewrote local-only toots management for upstream's changes. | |||
| 2020-09-07 | Refactor how public and tag timelines are queried (#14728) | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |