1
0
mirror of https://github.com/github/gitignore synced 2024-12-04 17:35:43 +01:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jens Jahnke 2013-08-29 19:46:49 +02:00
commit 291a730348
2 changed files with 2 additions and 0 deletions

View File

@ -1,5 +1,6 @@
# Object files # Object files
*.o *.o
*.ko
# Libraries # Libraries
*.lib *.lib

View File

@ -16,3 +16,4 @@ capybara-*.html
rerun.txt rerun.txt
pickle-email-*.html pickle-email-*.html
.project .project
config/initializers/secret_token.rb