Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.		2020-07-15 15:32:40 +02:00
..
chewy	Change `tootctl search deploy` algorithm (#14300)	2020-07-14 18:10:35 +02:00
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-26 13:02:14 +02:00
javascript	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +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-15 15:32:40 +02:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-07 15:58:45 +02:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
views	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-10 16:51:51 +02:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-05 19:35:56 +02:00