Merge pull request #12955 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Thu, 18 Oct 2018 10:51:02 +0000 (23:51 +1300)
committerGitHub <noreply@github.com>
Thu, 18 Oct 2018 10:51:02 +0000 (23:51 +1300)
commitdf466fe7c79b59e699cf2437f5da2e6e548d5f7b
tree0bfcc949e029c73b6cee88531b0687fd9b4584b9
parent52b6156ce25f50e1a864a963102dbfc196db1b8e
parent7cb379d6bee97b01bdb9502331eec69402322929
Merge pull request #12955 from civicrm/5.7

5.7 to master