djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-25 01:24:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
bdc1581556
tootlab-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 Add relationship manager UI (#10268) 2019-03-16 11:23:22 +01:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-01-20 18:31:11 +01:00