Merge pull request #6768 from totten/master-composer-lock
authorTim Otten <totten@civicrm.org>
Fri, 18 Sep 2015 19:51:47 +0000 (12:51 -0700)
committerTim Otten <totten@civicrm.org>
Fri, 18 Sep 2015 19:51:47 +0000 (12:51 -0700)
commit5aec1a43ca3d0e41a93d2ee4be1f7a1daac2f31a
treefcc1e4407b3395991d71a972723fa43f4e43e783
parent6ce6d46c4a3dcc166053d7ddf8be6dad2eb12d29
parent04c3645265dc617a5f4d4a7f376d2e2e986e440a
Merge pull request #6768 from totten/master-composer-lock

composer.lock - update