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

Improve report layout (#7188)

2018-04-20 02:28:48 +02:00

_status.html.haml

Fix broken report detail (regression from #8569) (#8795)

2018-09-26 19:48:14 +02:00

index.html.haml

Group reports by target account (#8674)

2018-09-13 03:44:08 +02:00

show.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2018-12-23 11:28:28 +01:00