Merge pull request #7389 from totten/master-cxn-proxy
authorTim Otten <totten@civicrm.org>
Mon, 7 Dec 2015 03:38:18 +0000 (19:38 -0800)
committerTim Otten <totten@civicrm.org>
Mon, 7 Dec 2015 03:38:18 +0000 (19:38 -0800)
commit32f4359b126b925347282af05c21f8f862a0b083
treef37158233bcbcd399fa2b93e4699d6bef02d22be
parent9bbcbfceabc1087bf7b6cddc0cc7fb0c0637ca66
parent40278a8edcef12eb1ef0108658cab77e87a997d8
Merge pull request #7389 from totten/master-cxn-proxy

CiviConnect - Proxy support; UI tweaks; System.get improvements