You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		7 years ago
..
activitypub	Save media outside transaction (#5959)	7 years ago
ostatus	Save media outside transaction (#5959)	7 years ago
settings	…
application_extension.rb	…
delivery_failure_tracker.rb	…
exceptions.rb	…
extractor.rb	Using double splat operator (#5859)	7 years ago
feed_manager.rb	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
formatter.rb	Using double splat operator (#5859)	7 years ago
frontmatter_handler.rb	…
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	Improve language filter (#5724)	7 years ago
provider_discovery.rb	Fix XML oEmbed support discovery (#6104)	7 years ago
request.rb	Using double splat operator (#5859)	7 years ago
sanitize_config.rb	…
status_filter.rb	Do not hide statuses from silenced accounts from other silenced accounts (#6030)	7 years ago
status_finder.rb	…
tag_manager.rb	…
themes.rb	Screenshot support for themes	7 years ago
user_settings_decorator.rb	fixed fav setting change	7 years ago
webfinger_resource.rb	…