Thibaut Girka 11cc2e099a Merge branch 'master' into glitch-soc/merge-master ... Conflicts: app/javascript/styles/mastodon-light.scss config/themes.yml Removed config/themes.yml, took upstream's mastodon-light.scss		2018-05-25 18:59:02 +02:00
..
activitypub	Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)	2018-05-25 14:26:45 +02:00
ostatus	Raise Mastodon::RaceConditionError if Redis lock failed (#7511)	2018-05-16 12:29:45 +02:00
settings
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb	Fix missing updated_at attribute on emoji EntityCache (#7297)	2018-04-30 22:49:33 +02:00
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
formatter.rb	Enable custom emojis in profiles (notes, field values, display names) (#7374)	2018-05-06 11:48:51 +02:00
frontmatter_handler.rb
hash_object.rb
inline_renderer.rb
language_detector.rb
request.rb	User agent for WebFinger (#7531)	2018-05-18 01:47:22 +02:00
rss_builder.rb
sanitize_config.rb
sidekiq_error_handler.rb
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	2018-05-03 10:41:58 +02:00
status_finder.rb
tag_manager.rb
themes.rb
user_settings_decorator.rb	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-05-18 08:47:10 -05:00
webfinger_resource.rb