Merge branch 'master' into 14988-wb-rails5-upgrade
[arvados.git] / apps / workbench / config / locales /
drwxr-xr-x   ..
-rw-r--r-- 459 en.bootstrap.yml
-rw-r--r-- 311 en.yml