Merge remote-tracking branch 'upstream/pull/2196'
[rails.git] / config / settings /
drwxr-xr-x   ..
-rw-r--r-- 0 development.yml
-rw-r--r-- 0 production.yml
-rw-r--r-- 603 test.yml