Merge remote-tracking branch 'upstream/pull/1857'
authorTom Hughes <tom@compton.nu>
Mon, 14 May 2018 19:13:41 +0000 (20:13 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 14 May 2018 19:13:41 +0000 (20:13 +0100)
commit33ea119c8f520a7e679e38b569c202976907a501
tree07598fe9a80637082d9982d95fabd97fb9ee83d3
parente1050a2d1de35e4bf5259c3f7340f475726ff8df
parentb446138aefb04799cc1253886335ced16e546517
Merge remote-tracking branch 'upstream/pull/1857'
app/views/user/view.html.erb