Thibaut Girka 5088eb8388 Merge branch 'master' into glitch-soc/merge-upstream		2019-09-05 11:36:41 +02:00
..
applications
deletes	Change account deletion page to have better explanations (#11753)	2019-09-04 04:13:54 +02:00
exports
featured_tags	Add explanation to featured hashtags page and profile (#11586)	2019-08-17 18:07:52 +02:00
flavours	Fix settings/flavours	2019-03-16 16:21:20 +01:00
identity_proofs	squashed identity proof updates (#10375)	2019-03-28 18:01:09 +01:00
imports	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
migrations
preferences	Add option to disable emoji replacements	2019-08-12 23:01:37 +02:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-30 13:38:41 +02:00
shared
two_factor_authentication
two_factor_authentications