This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
flavours	[Glitch] Fix frontend crash when deleting announcements	2020-03-27 22:06:42 +01:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-02 20:32:00 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-02 20:32:00 +02:00