tykayn aa4b715513 Merge remote-tracking branch 'glitch-soc/main' ... # Conflicts: # app/controllers/concerns/sign_in_token_authentication_concern.rb # app/javascript/mastodon/features/compose/components/action_bar.js # app/javascript/mastodon/features/compose/index.js		2022-05-10 10:17:24 +02:00
..
bliss	add bliss custom pictures	2021-11-15 12:00:12 +01:00
contrast	Fix unreadable placeholder text color in high contrast theme in web UI (#14803)	2020-09-15 09:24:24 +02:00
custom	fix mess footer	2020-02-01 17:29:30 +01:00
default	fix mess footer	2020-02-01 17:29:30 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 22:14:26 +02:00
mastodon	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +02:00
mastodon-light	up from glitch	2022-03-29 10:14:34 +02:00
application.scss	style on homepage bliss	2022-03-29 11:38:56 +02:00
bliss.scss	custom style	2020-11-01 10:42:32 +01:00
contrast.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
custom.scss	hop	2020-02-01 17:43:33 +01:00
large_center.scss	hop	2020-02-01 17:43:33 +01:00
mailer.scss	Remove sign-in token authentication, instead send e-mail about new sign-in (#17970)	2022-04-06 20:58:12 +02:00
mastodon-light.scss	up theme bliss, remove postcss	2021-05-24 12:10:49 +02:00
win95.scss	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +02:00