Merge branch '12511-is-trashed-query' refs #12511
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 11 Dec 2017 21:34:37 +0000 (16:34 -0500)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 11 Dec 2017 21:35:05 +0000 (16:35 -0500)
commitb112b002ee3239803d1948e99463144812a2c213
tree882fbf0b6fe69c5efb6b2c63ee944bc7d4b452c8
parentdd9651140d782919e475a6252e4c770c46d96252
parent363fc6395f866a9631f41630cbff49ac53e9a211
Merge branch '12511-is-trashed-query' refs #12511

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>