about summary refs log tree commit diff
path: root/public/emoji/1f575-1f3fb-200d-2640-fe0f.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-03-20 13:54:00 +0100
committerThibaut Girka <thib@sitedethib.com>2019-03-20 13:54:00 +0100
commit1d6152f4404d40a6113bad2e70326fb5c2145ef4 (patch)
tree4edcc500883b3e533c06517b147bf221b06f6bf0 /public/emoji/1f575-1f3fb-200d-2640-fe0f.svg
parentb9a998f201913dd1c89ddcb0c4c9e181eb73bfcf (diff)
parent158c31b9df538691666e5b91f48a0afecd2985fe (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
Diffstat (limited to 'public/emoji/1f575-1f3fb-200d-2640-fe0f.svg')
0 files changed, 0 insertions, 0 deletions