luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-27 23:56:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/settings/about
History
Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
..
show.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00