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 c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.		2020-11-12 22:13:57 +01:00
..
contrast	…
fonts	…
mastodon	…
mastodon-light	…
application.scss	…
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…