about summary refs log tree commit diff
path: root/public/emoji/1f429.svg
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-05-16 22:29:05 +0200
committerClaire <claire.github-309c@sitedethib.com>2022-05-16 22:29:05 +0200
commit4415005de73579110a5bbc31bdd55dc89bf726e1 (patch)
treeac1b378fdfbe5bd301c60f18a565f303156878fc /public/emoji/1f429.svg
parentb91196f4b73fff91997b8077619ae25b6d04a59e (diff)
parentd25015fc5b6c6b31dcf726b02dd0742475d9d9c8 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Conflict caused because of minor code style change upstream, while glitch-soc
  has different code for handling variable maximum chars.
  Ported the change.
- `app/serializers/initial_state_serializer.rb`:
  Conflict because glitch-soc had two extra attributes where upstream added
  one.
  Added upstream's attribute.
Diffstat (limited to 'public/emoji/1f429.svg')
0 files changed, 0 insertions, 0 deletions