Baptiste Lemoine 6e9a6e82d6 Merge branch 'merged-master'		2020-07-17 21:00:06 +02:00
..
assets	prototype for groups	2019-08-27 17:05:17 +02:00
chewy	Change tootctl search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
controllers	Merge branch 'merged-master'	2020-07-17 21:00:06 +02:00
helpers	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
javascript	Merge branch 'merged-master'	2020-07-17 21:00:06 +02:00
lib	Fix boosted toots from blocked account not being retroactively removed from TL (#14339)	2020-07-17 07:07:54 +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 'merged-master'	2020-07-17 21:00:06 +02:00
policies	Add ability to delete files uploaded for settings in admin UI (#13192)	2020-03-08 16:00:24 +01:00
presenters	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
serializers	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
services	Fix removing allowed domains being done synchronously (#14302)	2020-07-15 21:08:19 +02:00
validators	hop	2020-07-09 10:48:27 +02:00
views	Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master	2020-07-17 20:49:44 +02:00
workers	Fix removing allowed domains being done synchronously (#14302)	2020-07-15 21:08:19 +02:00