projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb5a910 be4d579)
Merge pull request #6825 from jitendrapurohit/CRM-17169reg
authorMonish Deb <monish.deb@webaccessglobal.com>
Mon, 28 Sep 2015 17:55:59 +0000 (23:25 +0530)
committerMonish Deb <monish.deb@webaccessglobal.com>
Mon, 28 Sep 2015 17:55:59 +0000 (23:25 +0530)
CRM-17169 -- Fix upgrade conflict


Trivial merge