mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2025-01-06 09:53:15 +09:00
Code
ccdf56085d
YuruToot/app/views/admin/settings/content_retention
History
Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
show.html.haml Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00