Merge branch 'pr/2871' into pull-request-2871
commit55cc5b999d5e659fe30cd52ddad4a3f0dea44474
authorAndreas Gohr <gohr@cosmocode.de>
Tue, 15 Oct 2019 09:58:07 +0000 (15 11:58 +0200)
committerAndreas Gohr <gohr@cosmocode.de>
Tue, 15 Oct 2019 09:58:07 +0000 (15 11:58 +0200)
treede33491bea54b874620e7aa81edf35a149cfafbf
parent589c037c8dec7dc094d996c1fcf22ed7e9904cb4
parent32168a788f16735bee811b64fb18df40156c5e02
Merge branch 'pr/2871' into pull-request-2871

* pr/2871:
  Rename _acl_add to _acl_addOrUpdate
  Fix #1115
lib/plugins/acl/admin.php
lib/plugins/acl/remote.php