]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Wed, 9 Feb 2022 16:28:33 +0000 (17:28 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Wed, 9 Feb 2022 16:28:33 +0000 (17:28 +0100)
commit322e907e0417da482789e4d24263f247f29a5769
tree8356833bbbf82de571feb1d739e0db7e2a50c9be
parent8987ea4d6b236657b8ea97d619902668768ae8ff
parent3aebe711fd54d75c1ea35e65a5dc342e78508d15
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.
app/javascript/styles/mastodon/components.scss
app/lib/formatter.rb
app/views/admin/follow_recommendations/show.html.haml
app/views/settings/preferences/appearance/show.html.haml
app/views/settings/preferences/other/show.html.haml