Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system

2020-01-24 14:37:06 +01:00

..

_bio.html.haml

Add Keybase integration (#10297)

2019-03-18 21:00:55 +01:00

_header.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2019-04-22 20:40:04 +02:00

_moved.html.haml

Add noopener and/or noreferrer (#12202)

2019-10-24 22:44:42 +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 duplicate “description” meta tag on accounts public pages (#12923)

2020-01-22 16:26:23 +01:00