about summary refs log tree commit diff
path: root/public/emoji/1f468-1f3fd-200d-1f3a4.svg
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-02-09 12:15:55 +0100
committerThibaut Girka <thib@sitedethib.com>2020-02-09 12:15:55 +0100
commitdae5e446fe7294dba0e14311ef3da4dc8fff6a3a (patch)
tree33a76386b1e8bc9c968bfc49409f72000b7ec410 /public/emoji/1f468-1f3fd-200d-1f3a4.svg
parenta2cfe3daaadabfaad71969a44c460bd76b8405ff (diff)
parent57c42c20c01b46f0d7cad5a357d56190274a3fa1 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.
Diffstat (limited to 'public/emoji/1f468-1f3fd-200d-1f3a4.svg')
0 files changed, 0 insertions, 0 deletions