Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		2020-07-01 19:23:14 +02:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
fabricators	Change move handler to carry blocks over (#14144)	2020-07-01 13:51:15 +02:00
features
fixtures
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-04 21:47:37 +02:00
lib	Add support for “start” and “reversed” attributes to ol element	2020-07-01 01:02:27 +02:00
mailers	Add e-mail-based sign in challenge for users with disabled 2FA (#14013)	2020-06-09 10:23:06 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
policies
presenters
requests
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
support
validators
views
workers	Change move handler to carry blocks over (#14144)	2020-07-01 13:51:15 +02:00
rails_helper.rb
spec_helper.rb