Merge remote-tracking branch 'upstream/master'

94f45ecd · pangratz · 52b97d30 · 85d17967 · 94f45ecd
Commit 94f45ecd authored Dec 12, 2011 by pangratz
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

Rails.gitignore Rails.gitignore +0 -1

No files found.
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -12,6 +12,5 @@ capybara-*.html
 /coverage/
 /spec/tmp/*
 **.orig
-config/*.yml
 rerun.txt
 pickle-email-*.html
\ No newline at end of file