luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 15:34:55 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/reports
History
Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.
2020-01-20 18:31:11 +01:00
..
_action_log.html.haml
_status.html.haml Fix admin interface crashing when listing boosts with non-video media attachments (#12907) 2020-01-20 17:39:14 +01:00
index.html.haml Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
show.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00