]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'main' into glitch-soc/merge-upstream
authorClaire <claire.github-309c@sitedethib.com>
Mon, 17 Jan 2022 09:45:25 +0000 (10:45 +0100)
committerClaire <claire.github-309c@sitedethib.com>
Mon, 17 Jan 2022 09:45:25 +0000 (10:45 +0100)
commitb3bf32a21e4dfc43737f50f15d3f258c16d0cf83
tree37daa7d7725d3676115eea2c4d4a215bdd95c06d
parent430d4427916b44e6a7c16db1899dfef2eec140fc
parent14f436c457560862fafabd753eb314c8b8a8e674
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/reports/show.html.haml`:
  Conflicts due to glitch-soc's theming system.
app/javascript/styles/mastodon/admin.scss
app/services/remove_status_service.rb
app/views/admin/action_logs/index.html.haml
app/views/admin/reports/show.html.haml
app/views/admin/statuses/index.html.haml
config/routes.rb
db/schema.rb