Merge branch 'master' into 2681-new-inactive-user-notification
[arvados.git] / services / api / app / views / admin_notifier /
drwxr-xr-x   ..
-rw-r--r-- 131 new_inactive_user.text.erb
-rw-r--r-- 174 new_user.text.erb