Merge branch 'master' into openstreetbugs
[rails.git] / .gitignore
1 log
2 public/assets
3 public/attachments
4 tmp
5 .DS_Store