Merge remote-tracking branch 'upstream/master' into vagrant

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 837249e00a04b432e8b8577d1d5be5b21a149c44..e507f9430496225b457220ff16ca916d1ac319bf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ tmp
 .DS_Store
 *~
 doc
+.vagrant