Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code		2019-09-18 17:25:56 +02:00
..
applications	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
deletes	Fix 2FA challenge and password challenge for non-database users (#11831)	2019-09-15 21:08:39 +02:00
exports	Add CSV export for lists and domain blocks (#9677)	2019-01-01 13:44:04 +01:00
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	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
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	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	2019-09-18 02:48:40 +02:00
two_factor_authentications	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	2019-09-18 02:48:40 +02:00