[ARVADOS] updated: 1595481c3e4cc42cfa5a47bbe501eb6e6f83db9f

[Git user]

Summary of changes:
 apps/workbench/app/views/trash_items/_show_recent_trash.html.erb | 2 +-
 apps/workbench/app/views/trash_items/_show_trash_rows.html.erb   | 4 ++--
 apps/workbench/app/views/trash_items/_untrash_item.html.erb      | 2 +-
 apps/workbench/test/integration/trash_test.rb                    | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

       via  1595481c3e4cc42cfa5a47bbe501eb6e6f83db9f (commit)
       via  d7bc150a11260ba93d3403ef4c49b12baf2a93a0 (commit)
      from  29cb16bdd726b09f8cded0d245ed6a72c62eaf8b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 1595481c3e4cc42cfa5a47bbe501eb6e6f83db9f
Merge: 29cb16b d7bc150
Author: radhika <radhika at curoverse.com>
Date:   Wed Jun 7 17:18:15 2017 -0400

    refs #9587
    Merge branch '9587-trash-page'


-----------------------------------------------------------------------


hooks/post-receive
--