diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
| commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
| tree | ef366f436ed5180489cc9377268e10328fe9a932 /public/emoji/1f9ce-1f3ff-200d-2640-fe0f.svg | |
| parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
| parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) | |
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.
Diffstat (limited to 'public/emoji/1f9ce-1f3ff-200d-2640-fe0f.svg')
0 files changed, 0 insertions, 0 deletions