about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-04-02 20:32:00 +0200
committerThibaut Girka <thib@sitedethib.com>2020-04-02 20:32:00 +0200
commitf3eff922a3350b9c54ef6fd5f8804722fdbe4c9c (patch)
tree01c49b43b2b4349756d5ea43f2330fd08d323c4a /app/javascript/flavours/glitch
parenta192b193bdf7013df09c6cd63916274cd9d47cf7 (diff)
parent69558d2fe5284d2b6168706bd7cbd8b7fb2b0847 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
Diffstat (limited to 'app/javascript/flavours/glitch')
0 files changed, 0 insertions, 0 deletions