luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 21:26:52 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/relationships
History
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +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 2019-03-28 13:01:33 +01:00