David Yip eb39db7f93 Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml

2018-04-01 20:24:50 -05:00

..

activitypub

Fix #6657 - Use target instead of origin in Remove activity (#6664)

2018-03-07 03:54:46 +01:00

ostatus

…

settings

…

delivery_failure_tracker_spec.rb

…

extractor_spec.rb

…

feed_manager_spec.rb

…

formatter_spec.rb

[WIP] Enable custom emoji on account pages and in the sidebar (#6124)

2018-04-01 23:55:42 +02:00

hash_object_spec.rb

…

language_detector_spec.rb

Fix filterable_languages method of SettingsHelper (#4966)

2017-09-16 14:59:41 +02:00

provider_discovery_spec.rb

…

request_spec.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

status_filter_spec.rb

…

status_finder_spec.rb

…

tag_manager_spec.rb

…

user_settings_decorator_spec.rb

…

webfinger_resource_spec.rb

Fix randomly fail (regression from #3560) (#3580)

2017-06-05 10:03:36 +02:00