Merge pull request #12911 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 9 Oct 2018 13:23:34 +0000 (14:23 +0100)
committerGitHub <noreply@github.com>
Tue, 9 Oct 2018 13:23:34 +0000 (14:23 +0100)
commit9cf3130c382c1197b342da6a6987a71532d7b236
tree04752f38d96d0b96735a60347e8ac1960ccf2c85
parentb8ebe34c530297a2c8b6a7380ac204c6153ff74c
parentd037704fd8ded80e8f867e1cf8d6ef5975fe3f3f
Merge pull request #12911 from civicrm/5.7

5.7 to master