Thibaut Girka f3eff922a3
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.
2020-04-02 20:32:00 +02:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-01-25 11:54:10 +01:00
2020-01-25 11:54:10 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-02-08 23:33:22 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-01-23 22:04:00 +01:00
2020-02-08 23:33:22 +01:00
2020-03-25 23:17:14 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-17 10:53:53 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-01-24 00:23:30 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-01-23 22:04:00 +01:00
2020-03-25 23:17:14 +01:00
2020-01-23 22:04:00 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-02-03 15:52:20 +01:00
2020-02-08 23:33:22 +01:00
2020-03-25 23:17:14 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-01-23 22:04:00 +01:00
2020-02-03 15:52:20 +01:00
2020-01-23 22:04:00 +01:00
2020-01-25 11:54:10 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-04-02 20:32:00 +02:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-27 21:54:44 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-03-12 17:57:59 +01:00
2020-03-12 17:57:59 +01:00
2020-03-27 21:54:44 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-22 16:10:44 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-27 21:54:44 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-01-25 11:54:10 +01:00
2020-01-25 11:54:10 +01:00
2020-03-25 23:17:14 +01:00
2020-03-27 21:54:44 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-02-03 15:52:20 +01:00
2020-03-25 23:17:14 +01:00
2020-01-25 11:54:10 +01:00
2020-01-25 11:54:10 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-03-12 17:57:59 +01:00
2020-03-12 17:57:59 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-03-12 17:57:59 +01:00
2020-03-25 23:17:14 +01:00
2020-03-12 17:57:59 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
2020-03-25 23:17:14 +01:00
f3eff922a3