luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-03 12:03:57 +00:00
Code Issues Projects Releases Wiki Activity
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