chris
d766eea9f4
Conflicts: lib/tasks/migrate.rake Conflicts: lib/tasks/migrate.rake Conflicts: config/resque_schedule.yml lib/tasks/migrate.rake
29 lines
287 B
Plaintext
29 lines
287 B
Plaintext
!.gitignore
|
|
.bundle
|
|
.DS_Store
|
|
.rvmrc
|
|
|
|
Gemfile.lock
|
|
Procfile
|
|
log/*
|
|
|
|
db/*.sqlite3
|
|
log/*.log
|
|
public/assets
|
|
public/index.html
|
|
public/panel/**/*
|
|
public/uploads/**/*
|
|
solr/data
|
|
tmp/**/*
|
|
uploads/**/*
|
|
config/*.god
|
|
log/*.gz
|
|
tmp/restart.txt
|
|
*.swp
|
|
*.pid
|
|
*.lck
|
|
|
|
.sass-cache/*
|
|
*.supported
|
|
mongoid.yml
|