projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e1050a2
b446138
)
Merge remote-tracking branch 'upstream/pull/1857'
author
Tom Hughes
<tom@compton.nu>
Mon, 14 May 2018 19:13:41 +0000
(20:13 +0100)
committer
Tom Hughes
<tom@compton.nu>
Mon, 14 May 2018 19:13:41 +0000
(20:13 +0100)
1
2
app/views/user/view.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/views/user/view.html.erb
Simple merge