mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-03 01:39:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/admin/settings/discovery
History
Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes.
2023-01-18 17:38:11 +01:00
..
show.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2023-01-18 17:38:11 +01:00