projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf84f43 607a937)
Merge pull request #6449 from monishdeb/master
authorMonish Deb <monish.deb@webaccessglobal.com>
Sun, 9 Aug 2015 10:38:16 +0000 (16:08 +0530)
committerMonish Deb <monish.deb@webaccessglobal.com>
Sun, 9 Aug 2015 10:38:16 +0000 (16:08 +0530)
Resolved merge conflict on CustomQuery file


Trivial merge