projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b897832
45e6ebc
)
Merge remote-tracking branch 'upstream/pull/1816'
author
Tom Hughes
<tom@compton.nu>
Sun, 15 Apr 2018 18:55:03 +0000
(19:55 +0100)
committer
Tom Hughes
<tom@compton.nu>
Sun, 15 Apr 2018 18:55:03 +0000
(19:55 +0100)
1
2
app/views/diary_entry/_diary_entry.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/views/diary_entry/_diary_entry.html.erb
Simple merge
projects / rails.git / commitdiff