Merge remote-tracking branch 'upstream/master'

2011-12-12 14:02:39 +01:00
parent 52b97d304b 85d179675a
commit 94f45ecd5c
1 changed files with 0 additions and 1 deletions
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -12,6 +12,5 @@ capybara-*.html
 /coverage/
 /spec/tmp/*
 **.orig
-config/*.yml
 rerun.txt
 pickle-email-*.html