aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-10-06 16:17:02 -0300
committerEmilio Tagua <miloops@gmail.com>2009-10-06 16:17:02 -0300
commitc3b4da7796f0aab23b11521cf86171a83d84ad3e (patch)
tree754b08169f3297623ab0754bed6833109483830e /.gitignore
parent97aba353c80d3a55f79f9d280035be566c3bc0ef (diff)
parent126f623711ce421b7b1bbf7e94099403ecaf2d20 (diff)
downloadrails-c3b4da7796f0aab23b11521cf86171a83d84ad3e.tar.gz
rails-c3b4da7796f0aab23b11521cf86171a83d84ad3e.tar.bz2
rails-c3b4da7796f0aab23b11521cf86171a83d84ad3e.zip
Merge commit 'rails/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 1c94c4b0f8..da296e7e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,5 +30,4 @@ railties/guides/output
actionpack/bin
vendor/gems/
*/vendor/gems/
-bin/
railties/tmp