projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9b5914f
d46d3ea
)
Empty merge commit to mark 4.7.18-rc merged.
author
eileen
<emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 06:54:25 +0000
(19:54 +1300)
committer
eileen
<emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 06:54:25 +0000
(19:54 +1300)
Somehow we lost the merged marker with a cherry pick.
Have used merge -s ours
d46d3ea
to grab these as empty-but-merged
Trivial merge
projects / civicrm-core.git / commitdiff