diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-11 11:23:50 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-11 11:23:50 +0100 |
| commit | 89bee860cdae399b796814f80a48eafa8b838d92 (patch) | |
| tree | 7f31aaa85f78b170f22cadd8c53fca8d09f8e795 /public/emoji/1f919-1f3fc.svg | |
| parent | 3cef04610cd809c7bd01adc00d34fb3d25261a16 (diff) | |
| parent | 13a7f05030cdcbab24aeb25944a9a430238dbff1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.
Diffstat (limited to 'public/emoji/1f919-1f3fc.svg')
0 files changed, 0 insertions, 0 deletions