Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		2019-01-02 15:36:53 +01:00
..
applications	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
deletes
exports	Add CSV export for lists and domain blocks (#9677)	2019-01-01 13:44:04 +01:00
flavours	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
follower_domains
imports	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
migrations	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
notifications	Add preference for report notification e-mails, skip for duplicates (#8559)	2018-09-02 00:11:58 +02:00
preferences	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
shared
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