Merge branch '4.6-enable-button' of https://github.com/helenagarcia90/civicrm-core...
authorCiviCRM <info@civicrm.org>
Thu, 7 Jan 2016 23:32:20 +0000 (15:32 -0800)
committerCiviCRM <info@civicrm.org>
Thu, 7 Jan 2016 23:32:20 +0000 (15:32 -0800)
commit8aaf9b8c55f64a2e5a0caab010f86d6b146039aa
tree6e64d2cee650ca24a38d5e9a009a35d7f40b9310
parent0c00373e0683ee7aef3d7c3420a1b061ca511d78
parente1df10daa71b431d078178a03ac0fb1d7ad2c9e3
Merge branch '4.6-enable-button' of https://github.com/helenagarcia90/civicrm-core into helenagarcia90-4.6-enable-button
ang/crmCxn/ManageCtrl.html
ang/crmCxn/ManageCtrl.js
api/v3/Cxn.php