Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... 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		2019-12-19 13:52:54 +01:00
..
activitypub	Fixes featured hashtag setting page erroring out instead of rejecting invalid tags (#12436)	2019-12-17 13:31:56 +01:00
connection_pool	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
ostatus	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
proof_provider/keybase
settings
delivery_failure_tracker_spec.rb
extractor_spec.rb
feed_manager_spec.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-05 13:13:28 +02:00
formatter_spec.rb	Play animated custom emoji on hover (#11348)	2019-07-21 18:10:40 +02:00
hash_object_spec.rb
language_detector_spec.rb	Change language detection to include hashtags as words (#11341)	2019-07-18 03:02:15 +02:00
request_pool_spec.rb	Add request pool to improve delivery performance (#10353)	2019-07-02 00:34:38 +02:00
request_spec.rb
sanitize_config_spec.rb	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
spam_check_spec.rb	Remove auto-silence behaviour from spam check (#12117)	2019-10-09 07:11:23 +02:00
status_filter_spec.rb
status_finder_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
tag_manager_spec.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00
user_settings_decorator_spec.rb
webfinger_resource_spec.rb