Claire e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream removed their direct dependency `autoprefixer`, which was textually adjacent to glitch-soc-only dependency `atrament`. Removed direct dependency on `autoprefixer`. - `yarn.lock`: Upstream removed their direct dependency `autoprefixer`, which was textually adjacent to glitch-soc-only dependency `atrament`. Removed direct dependency on `autoprefixer`.		2024-08-02 18:09:48 +02:00
..
contrast	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
fonts	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
mastodon	Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream	2024-08-02 18:09:48 +02:00
mastodon-light	Follow up tweaking of admin UI changes (#31168)	2024-07-29 08:10:23 +00:00
application.scss	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
inert.scss	Use the assets pipeline to load `inert.css` (#28701)	2024-01-12 09:32:45 +00:00
mailer.scss	New welcome email (#28883)	2024-03-01 12:16:53 +00:00
mastodon-light.scss	More polished light theme (#7620)	2018-05-25 18:36:26 +02:00
win95.scss	Fix deprecation warning in win95 theme	2024-07-10 17:46:33 +02:00