luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 08:13:24 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/relationships
History
Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
2020-01-20 18:31:11 +01:00
..
_account.html.haml
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00