From: Ward Vandewege <wvandewege@veritasgenetics.com>
Date: Wed, 16 Aug 2017 20:13:57 +0000 (-0400)
Subject: Merge branch '12122-rails-groups-assets-fix'
X-Git-Tag: 1.1.0~81
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6f2ce945ee9ad422c3b28fb6433e22d816dddfe1

Merge branch '12122-rails-groups-assets-fix'

closes #12122

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

6f2ce945ee9ad422c3b28fb6433e22d816dddfe1