tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
1064a9d827b5ec773e13c9bd10459f598b6ef84f
Mastodon/app/controllers/relationships_controller.rb
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

2.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink