mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-01 20:45:56 +00:00
020b40efdb
Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml |
||
---|---|---|
.. | ||
activitypub | ||
ostatus | ||
settings | ||
activity_tracker.rb | ||
application_extension.rb | ||
delivery_failure_tracker.rb | ||
exceptions.rb | ||
extractor.rb | ||
feed_manager.rb | ||
formatter.rb | ||
frontmatter_handler.rb | ||
hash_object.rb | ||
inline_renderer.rb | ||
language_detector.rb | ||
provider_discovery.rb | ||
request.rb | ||
sanitize_config.rb | ||
status_filter.rb | ||
status_finder.rb | ||
tag_manager.rb | ||
themes.rb | ||
user_settings_decorator.rb | ||
webfinger_resource.rb |