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.

Claire 3622110778 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Filtering code for streaming notifications has been refactored upstream, but glitch-soc had similar code for local-only toots in the same places. Ported upstream changes, but did not refactor local-only filtering.		2021-09-26 18:28:59 +02:00
..
core	…
flavours	Fix media icons not being added in CWs	2021-09-09 17:14:09 +02:00
fonts	…
images	…
locales	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-26 18:28:59 +02:00
packs	…
skins	…
styles	Merge branch 'main' into glitch-soc/merge-upstream	2021-08-20 13:01:50 +02:00