Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.		2019-04-08 15:57:56 +02: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	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00