Merge branch '10538-trash-delete' closes #10538
authorTom Clegg <tom@curoverse.com>
Fri, 30 Dec 2016 20:17:02 +0000 (15:17 -0500)
committerTom Clegg <tom@curoverse.com>
Fri, 30 Dec 2016 20:17:02 +0000 (15:17 -0500)
commita12864a31d5569c74ed32157d5fe928a1c2563b7
tree07f5a4c21a40f42c054490bd4a767bf1ac2575c3
parentb9df977af1ca8d7fe942cbe13956fa19ed88b91d
parent29246b83f1b1c66eb12ed53c844ef37ee0b77568
Merge branch '10538-trash-delete' closes #10538