tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
4412e2579c38ab32f698a28d0d9a6f4771b09c79
Mastodon/app/controllers/relationships_controller.rb
Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
2020-01-24 14:37:06 +01:00

1.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink