luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-24 14:17:08 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/reports
History
Thibaut Girka 3e686beaea Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.
2018-12-23 11:28:28 +01:00
..
_action_log.html.haml
_status.html.haml Fix broken report detail (regression from #8569) (#8795) 2018-09-26 19:48:14 +02:00
index.html.haml
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2018-12-23 11:28:28 +01:00