mastodon/app/lib
David Yip 67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
..
activitypub
ostatus
settings
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
exceptions.rb
extractor.rb
fast_geometry_parser.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
sidekiq_error_handler.rb
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb
user_settings_decorator.rb Merge remote-tracking branch 'origin/master' into gs-master 2018-04-08 19:05:02 -05:00
webfinger_resource.rb