Merge pull request #1 from civicrm/master
authorMartin <martinh@peaceworks.ca>
Fri, 4 Jan 2019 15:49:08 +0000 (10:49 -0500)
committerMartin <martinh@peaceworks.ca>
Fri, 1 Feb 2019 13:48:25 +0000 (13:48 +0000)
Update master from upstream

1  2 
api/v3/Mailing.php

Simple merge