fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 23:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/admin/action_logs
History
Claire b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
..
_action_log.html.haml Fix brakeman warning (#15870) 2021-03-19 23:48:59 +01:00
index.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00