Merge branch 'master' into 3153-auto-setup-user
[arvados.git] / services / api / app / views / admin_notifier /
drwxr-xr-x   ..
-rw-r--r-- 241 new_inactive_user.text.erb
-rw-r--r-- 455 new_user.text.erb