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
..
_bio.html.haml	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
_header.html.haml	Rename hide_followers_count helper to hide_followers_count?	2018-12-28 20:05:47 +01:00
_moved.html.haml	Add rel=me to moved accounts' link (#8742)	2018-09-20 22:53:30 +02:00
_og.html.haml	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
show.html.haml	Fix pinned statuses being shown in a featured hashtag (#9971)	2019-02-05 00:27:18 +01:00