Claire f55959ebd9 Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.		2023-07-30 14:58:56 +02:00
..
contrast	Fix translate button position (#25807)	2023-07-08 00:12:31 +02:00
fonts	Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream	2023-07-13 13:49:58 +02:00
mastodon	Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream	2023-07-30 14:58:56 +02:00
mastodon-light	Fix missing border on error screen in light theme in web UI (#26152)	2023-07-24 19:53:33 +02:00
application.scss	Add support for incoming rich text (#23913)	2023-03-03 20:19:29 +01:00
contrast.scss	…
mailer.scss	Update Stylelint (#25819)	2023-07-12 12:31:23 +02:00
mastodon-light.scss	…
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00