David Yip 7174d1c955 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss		2017-12-26 22:24:19 -06:00
..
activitypub	Save media outside transaction (#5959)	2017-12-10 16:33:52 +01:00
ostatus
settings	Refactor Setting (#3302)	2017-05-25 14:14:36 +02:00
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	fixed fav setting change	2017-12-09 12:17:20 -06:00
webfinger_resource.rb