Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01: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	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
imports	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
migrations
notifications
preferences	Make displaying application used to toot opt-in (#9897)	2019-02-02 19:18:15 +01: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