Merge branch '12122-rails-groups-assets-fix'
authorWard Vandewege <wvandewege@veritasgenetics.com>
Wed, 16 Aug 2017 20:13:57 +0000 (16:13 -0400)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Wed, 16 Aug 2017 20:13:57 +0000 (16:13 -0400)
closes #12122

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>


Trivial merge