Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02:00
..
applications
deletes
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
notifications	Add preference to disable e-mails about new pending accounts (#10529)	2019-04-10 00:35:49 +02:00
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
shared
two_factor_authentication
two_factor_authentications