projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 172adc8 5fa8e57)
Merge branch 'CRM-14300' of github.com:monishdeb/civicrm-core into CRM-14300
authorkurund <kurund@civicrm.org>
Tue, 29 Apr 2014 00:05:33 +0000 (17:05 -0700)
committerkurund <kurund@civicrm.org>
Tue, 29 Apr 2014 00:05:33 +0000 (17:05 -0700)
commit4ab2e0d41a7d5d2b9c4d327b378717d521cf3fbd
treeda12044b99de97b813c4c623f34a49580c1ee881tree | snapshot (zip tar.gz)
parent172adc8eba88a81f4caa2ebc57c5746ee73993a9commit | diff
parent5fa8e57d6892e6e5361ce479f885765feb43e28dcommit | diff
Merge branch 'CRM-14300' of github.com:monishdeb/civicrm-core into CRM-14300

Conflicts:
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
sql/civicrm_generated.mysql

----------------------------------------
* CRM-14300: Slow query - participant report
  https://issues.civicrm.org/jira/browse/CRM-14300
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl diff1 | diff2 | blob | history