projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2190aad
473da37
)
Merge remote-tracking branch 'upstream/pull/2495'
author
Tom Hughes
<tom@compton.nu>
Wed, 15 Jan 2020 10:11:30 +0000
(10:11 +0000)
committer
Tom Hughes
<tom@compton.nu>
Wed, 15 Jan 2020 10:11:30 +0000
(10:11 +0000)
1
2
test/controllers/users_controller_test.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/controllers/users_controller_test.rb
Simple merge