mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-24 04:38:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/admin/settings/registrations
History
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35:55 +01:00
..
show.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00