Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

[selectricity] / .gitignore

*~
*.swp
database.yml
tmp
public/engine_files
.DS_Store
vendor/plugins/sitealizer/lib/last_update
public/pictures/*
public/skin_pictures
help
log/*
*~