Merge remote-tracking branch 'upstream/pull/1614'
[rails.git] / vendor /
drwxr-xr-x   ..
drwxr-xr-x - assets
drwxr-xr-x - generators