tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
1bf035fb67065f6f34b96cee3b49cbae8fd16ef5
Mastodon/app/services/post_status_service.rb
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00

5.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink