Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		2019-06-10 18:59:53 +02:00
..
applications	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
deletes	Fix autocomplete option in haml files (#4438)	2017-07-29 14:20:31 +02:00
exports	Add CSV export for lists and domain blocks (#9677)	2019-01-01 13:44:04 +01:00
featured_tags	Add featured hashtags to profiles (#9755)	2019-02-04 04:25:59 +01: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	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
two_factor_authentication	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
two_factor_authentications	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00