luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 20:27:07 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/accounts
History
Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Not really a conflict, upstream updated a dependency textually adjacent to a
  glitch-soc-only one.
  Updated the dependency as upstream did.
2022-05-11 09:37:48 +02:00
..
_bio.html.haml
_header.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
_moved.html.haml
_og.html.haml
show.html.haml
show.rss.ruby