Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb

Moved public.js changes to settings.js.

2018-12-09 16:08:04 +01:00

..

activitypub

…

ostatus

…

settings

…

activity_tracker.rb

…

application_extension.rb

…

delivery_failure_tracker.rb

…

entity_cache.rb

…

exceptions.rb

…

extractor.rb

…

fast_geometry_parser.rb

…

feed_manager.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-09 16:08:04 +01:00

formatter.rb

…

hash_object.rb

…

inline_renderer.rb

…

language_detector.rb

…

potential_friendship_tracker.rb

…

request.rb

…

rss_builder.rb

…

sanitize_config.rb

…

sidekiq_error_handler.rb

…

status_filter.rb

…

status_finder.rb

…

tag_manager.rb

…

themes.rb

…

user_settings_decorator.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-09 16:08:04 +01:00

webfinger_resource.rb

…