7709: Merge branch 'master' into 7709-api-rails4
[arvados.git] / services / api / app / controllers /
drwxr-xr-x   ..
-rw-r--r-- 17033 application_controller.rb
drwxr-xr-x - arvados
-rw-r--r-- 2702 database_controller.rb
-rw-r--r-- 702 static_controller.rb
-rw-r--r-- 5229 user_sessions_controller.rb