tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
d98fabf2ee44c2c25775066abda46552ab05993e
Mastodon/Gemfile
Thibaut Girka 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00

4.5 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink