diff .gitignore @ 1337:077b8890835a cannam

Merge from live branch
author Chris Cannam
date Thu, 20 Jun 2013 13:14:02 +0100
parents 433d4f72a19b
children 261b3d9a4903
line wrap: on
line diff
--- a/.gitignore	Fri Jun 14 11:30:07 2013 +0100
+++ b/.gitignore	Thu Jun 20 13:14:02 2013 +0100
@@ -5,6 +5,7 @@
 /config/database.yml
 /config/email.yml
 /config/initializers/session_store.rb
+/config/initializers/secret_token.rb
 /coverage
 /db/*.db
 /db/*.sqlite3
@@ -18,9 +19,12 @@
 /public/plugin_assets
 /tmp/*
 /tmp/cache/*
+/tmp/pdf/*
 /tmp/sessions/*
 /tmp/sockets/*
 /tmp/test/*
+/tmp/thumbnails/*
+/vendor/cache
 /vendor/rails
 *.rbc