diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-05 17:33:29 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-05 17:33:37 +0100 |
| commit | f8d867bac43e7e18d293ac32a9be597d1f46dce3 (patch) | |
| tree | b3d950a01a8dee5403081f56cf0c6b0571954e90 /public/emoji/1f468-200d-1f527.svg | |
| parent | 13df125b6c75923ccc21a5c57053e680cea75f38 (diff) | |
| parent | 44d5c6bc8ffd92cd201380dabe35748e50b6af68 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/remove_status_service.rb`: Conflict caused by us having a distinc Direct timeline. Ported upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict between glitch-soc's variable character limit and upstream refactoring that part of the code. Ported upstream changes.
Diffstat (limited to 'public/emoji/1f468-200d-1f527.svg')
0 files changed, 0 insertions, 0 deletions