merge upstream/master and resolve conflicts from https://github.com/openstreetmap...
[rails.git] / app /
drwxr-xr-x   ..
drwxr-xr-x - assets
drwxr-xr-x - controllers
drwxr-xr-x - helpers
drwxr-xr-x - models
drwxr-xr-x - views