mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-19 08:28:55 +00:00
040b7d37a4
Conflicts: - `app/services/remove_status_service.rb`: Conflict due to glitch-soc having extra code for a proper direct visibility timeline, in a part of the code upstream refactored. Restored glitch-soc's extra code in the refactored bit. |
||
---|---|---|
.. | ||
_og.html.haml | ||
show.html.haml | ||
show.rss.ruby |