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 e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		2020-09-07 09:21:38 +02:00
..
contrast	Fix sass-lint config (#10982)	2019-06-06 18:51:46 +02:00
fonts	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-01 17:02:18 +02:00
mastodon-light	Fix direct visibility style for light theme (#14727)	2020-09-04 08:49:56 +02:00
application.scss	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	2019-07-07 16:16:51 +02:00
contrast.scss	…
mailer.scss	Add option to include reported statuses in warning e-mail (#11639)	2019-08-23 22:37:23 +02:00
mastodon-light.scss	…
win95.scss	…