Merge remote-tracking branch 'upstream/master'

2024-12-04 17:35:43 +01:00 · 2013-08-29 19:46:49 +02:00 · 2013-08-29 19:46:49 +02:00 · 291a730348
commit 291a730348
parent 578b09f4be 6c75292e1e
2 changed files with 2 additions and 0 deletions
--- a/C.gitignore
+++ b/C.gitignore
@ -1,5 +1,6 @@
 # Object files
 *.o
+*.ko

 # Libraries
 *.lib
--- a/Rails.gitignore
+++ b/Rails.gitignore
@ -16,3 +16,4 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 .project
+config/initializers/secret_token.rb