Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		2021-07-08 16:17:19 +02:00
..
contrast	…
fonts	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
mastodon-light	Fixing the hero widget (#15926)	2021-03-19 20:23:32 +01:00
application.scss	…
contrast.scss	…
mailer.scss	Remove duplicate CSS properties (#16278)	2021-05-19 23:51:52 +02:00
mastodon-light.scss	…
win95.scss	…