Fixed merge fail - this branch doesn't have javascript_strings.
[rails.git] / app /
drwxr-xr-x   ..
drwxr-xr-x - controllers
drwxr-xr-x - helpers
drwxr-xr-x - models
drwxr-xr-x - views