Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
fabricators
features
fixtures
helpers
lib
mailers
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-15 17:11:40 +02:00
policies
presenters
requests
routing
serializers/activitypub
services	Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream	2019-06-03 14:54:30 +02:00
support
validators
views
workers	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
rails_helper.rb
spec_helper.rb