mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 00:46:12 +00:00
ab5ff638f2
Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc |
||
---|---|---|
.. | ||
activitypub | ||
connection_pool | ||
ostatus | ||
proof_provider/keybase | ||
settings | ||
delivery_failure_tracker_spec.rb | ||
extractor_spec.rb | ||
feed_manager_spec.rb | ||
formatter_spec.rb | ||
hash_object_spec.rb | ||
language_detector_spec.rb | ||
request_pool_spec.rb | ||
request_spec.rb | ||
sanitize_config_spec.rb | ||
spam_check_spec.rb | ||
status_filter_spec.rb | ||
status_finder_spec.rb | ||
tag_manager_spec.rb | ||
user_settings_decorator_spec.rb | ||
webfinger_resource_spec.rb |