Rebase including LibreJS change
authorMichael McMahon <michael@fsf.org>
Tue, 18 Aug 2020 20:13:46 +0000 (16:13 -0400)
committerMichael McMahon <michael@fsf.org>
Tue, 18 Aug 2020 20:13:46 +0000 (16:13 -0400)
commit85838829ba58c8ffa2d8d9941bbb2c1cf68d081d
tree255a89f496abb9cfb0f0fa9ff4b29501287bd4f4
parenta8322f20e88affab9de289400f6f029973c8e5ee
Rebase including LibreJS change
CRM/ACL/BAO/Cache.php
CRM/Contact/Task.php
CRM/Contribute/Task.php
CRM/Core/Resources.php
CRM/Import/Parser.php
CRM/Utils/PDF/Utils.php
CRM/Utils/Token.php
api/v3/Contact.php
api/v3/Contribution.php