Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml		2019-06-26 23:19:22 +02:00
..
activitypub	Add support for Audio activities (#11189)	2019-06-26 19:32:36 +02:00
ostatus	Change domain blocks to automatically support subdomains (#11138)	2019-06-22 00:13:10 +02:00
proof_provider	Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs (#10565)	2019-04-21 04:53:24 +02:00
settings
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
formatter.rb	Fix rendering of emoji in public pages	2019-06-18 20:14:08 +02:00
hash_object.rb
inline_renderer.rb
language_detector.rb
potential_friendship_tracker.rb
proof_provider.rb
request.rb
rss_builder.rb
sanitize_config.rb	Fix sanitizer making block level elements unreadable (#10836)	2019-06-16 21:46:36 +02:00
sidekiq_error_handler.rb
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-26 23:19:22 +02:00
webfinger_resource.rb