Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
94f45ecd5c
@ -12,6 +12,5 @@ capybara-*.html
|
|||||||
/coverage/
|
/coverage/
|
||||||
/spec/tmp/*
|
/spec/tmp/*
|
||||||
**.orig
|
**.orig
|
||||||
config/*.yml
|
|
||||||
rerun.txt
|
rerun.txt
|
||||||
pickle-email-*.html
|
pickle-email-*.html
|
Loading…
Reference in New Issue
Block a user