You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c37bc0b268 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.		6 years ago
..
_bio.html.haml	Add Keybase integration (#10297)	6 years ago
_header.html.haml	Rename hide_followers_count helper to hide_followers_count?	6 years ago
_moved.html.haml	Add rel=me to moved accounts' link (#8742)	6 years ago
_og.html.haml	Add description meta tag additionally to og:description (#8941)	6 years ago
show.html.haml	Fix pinned statuses being shown in a featured hashtag (#9971)	6 years ago