David Yip 77a92d3260 Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
 	Gemfile.lock

2018-05-04 09:42:31 -05:00

..

_account.html.haml

Improve report layout (#7188)

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

_action_log.html.haml

Improve report layout (#7188)

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

_report.html.haml

Show remote reports in admin UI as coming from domain rather than user (#7347)

2018-05-04 13:26:25 +02:00

_status.html.haml

Improve report layout (#7188)

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

index.html.haml

Improve report layout (#7188)

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

show.html.haml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-05-04 09:42:31 -05:00