Merge branch 'master' into 14988-wb-rails5-upgrade
[arvados.git] / services / api / app / views / static /
drwxr-xr-x   ..
-rw-r--r-- 1345 intro.html.erb
-rw-r--r-- 695 login_failure.html.erb