Merge pull request #4829 from totten/master-composer
authorTim Otten <totten@civicrm.org>
Mon, 5 Jan 2015 23:50:21 +0000 (15:50 -0800)
committerTim Otten <totten@civicrm.org>
Mon, 5 Jan 2015 23:50:21 +0000 (15:50 -0800)
commit9fab7c013cc2bc4908e3a77df8994c465a1ddbe1
tree00ad12c949a8ed2b24b539fcc781889dfad9639e
parentdf7d55be10f3cd25adbe63c3b7209eb1a43a2f1f
parentfd72e042ce1c4c1023575cddcc80b1bb7219eff1
Merge pull request #4829 from totten/master-composer

composer - Move composer.json into civicrm-core.git