projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5afd92 5802521)
Fix merge head on master.
authoreileen <emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 05:58:08 +0000 (18:58 +1300)
committereileen <emcnaughton@wikimedia.org>
Wed, 29 Mar 2017 05:59:59 +0000 (18:59 +1300)
Master is treating some 4.7.18-rc commits as unmerged. This just marks as merged : Merge commit '58025217985f3c8cf'


Trivial merge