about summary refs log tree commit diff
path: root/public/emoji/2716.svg
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-05-16 09:42:32 +0200
committerClaire <claire.github-309c@sitedethib.com>2022-05-16 09:42:32 +0200
commit040b7d37a460e5f023f7654b1b619368cbbc24ea (patch)
tree251a14cd362a6d98c1721e8f3f54fc386165e464 /public/emoji/2716.svg
parent94e98864e39c010635e839fea984f2b4893bef1a (diff)
parentc3fac61f56b3ad63534961f3d3c426cdf8ac6213 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/services/remove_status_service.rb`:
  Conflict due to glitch-soc having extra code for a proper direct visibility
  timeline, in a part of the code upstream refactored.
  Restored glitch-soc's extra code in the refactored bit.
Diffstat (limited to 'public/emoji/2716.svg')
0 files changed, 0 insertions, 0 deletions