mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-20 20:27:07 +00:00
33d30632fb
Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly. |
||
---|---|---|
.. | ||
controllers | ||
fabricators | ||
features | ||
fixtures | ||
helpers | ||
lib | ||
mailers | ||
models | ||
policies | ||
presenters | ||
requests | ||
routing | ||
serializers/activitypub | ||
services | ||
support | ||
validators | ||
views | ||
workers | ||
rails_helper.rb | ||
spec_helper.rb |