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 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's		2019-11-07 13:43:56 +01:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
flavours	[Glitch] Fix notification message for own poll	2019-11-06 15:06:53 +01:00
fonts	…
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
locales	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-07 13:43:56 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-06 14:38:28 +01:00
skins	…
styles	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-07 13:43:56 +01:00