Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		2018-11-27 13:23:02 +01:00
..
activitypub	Prevent multiple handlers for Delete of Actor from running (#9292)	2018-11-16 19:46:23 +01:00
ostatus	Improve support for aspects/circles (#8950)	2018-10-17 17:13:04 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 13:23:02 +01:00
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb	Remove intermediary arrays when creating hash maps from results (#9291)	2018-11-16 15:02:18 +01:00
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb	Include replies to list owner and replies to list members in list statuses (#9324)	2018-11-21 17:02:58 +01:00
formatter.rb	Remove intermediary arrays when creating hash maps from results (#9291)	2018-11-16 15:02:18 +01:00
hash_object.rb
inline_renderer.rb	Add conversations API (#8832)	2018-10-07 23:44:58 +02:00
language_detector.rb	Leave unknown language as nil if account is remote (#8861)	2018-10-05 19:17:46 +02:00
potential_friendship_tracker.rb	Fix activity:interactions counter to count all interactions (#8037)	2018-07-16 18:35:43 +02:00
request.rb	Fix connect timeout not being enforced (#9329)	2018-11-22 20:12:04 +01:00
rss_builder.rb
sanitize_config.rb	Whitelist dat/ipfs/gopher links in sanitizer (#8034)	2018-07-16 22:17:43 +09:00
sidekiq_error_handler.rb
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb	Allow selecting both default flavour and theme	2018-10-12 19:06:35 +02:00
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-01 12:43:20 +02:00
webfinger_resource.rb