mastodon/app/javascript
Thibaut Girka dae5e446fe 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.
2020-02-09 12:15:55 +01:00
..
core Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
flavours [Glitch] Fix dates (without time) being rendered as datetimes in public pages 2020-02-06 21:41:50 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-02-09 12:15:55 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2020-02-06 21:36:38 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-02-09 12:15:55 +01:00