Merge branch 'master' into next
[shapado:shapado.git] / .gitignore
1 *~
2 .DS_Store
3 *.orig
4 coverage
5 public/stylesheets/compiled/
6 config/shapado.yml
7 data/*.dat
8 config/database.yml
9 base_packaged.*
10 .directory
11 .bundle
12 log/*.log
13 tmp/**/*
14 vendor/cache/*.gem
15 public/javascripts/login_packaged.js
16 public/javascripts/show_packaged.js
17 public/javascripts/jsMath/fonts/