Merge pull request #5384 from davecivicrm/CRM-16108
[civicrm-core.git] / karma.conf.js
2015-03-12 Coleman WattsMerge branch '4.5' into 4.6
2015-03-09 kurundMerge remote-tracking branch 'upstream/4.5' into 4...
2015-03-05 Dave GreenbergMerge pull request #5314 from mlutfy/4.6-crm16059
2015-03-05 colemanwMerge pull request #5289 from mallezie/crm-16040
2015-03-04 Dave GreenbergMerge pull request #5297 from rohankatkar/CRM15729
2015-03-04 Tim OttenMerge pull request #5302 from totten/master-karma-phantom
2015-03-04 Tim OttenCRM-16046 - Move karma.conf.js to default location