FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/accounts
History
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
…
_header.html.haml
…
_moved.html.haml
…
_og.html.haml
…
show.html.haml Fix duplicate “description” meta tag on accounts public pages (#12923) 2020-01-22 16:26:23 +01:00