Bug 20568: Fix bad resolution conflict with bug 18403
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Tue, 8 May 2018 19:15:54 +0000 (16:15 -0300)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Wed, 9 May 2018 15:56:00 +0000 (12:56 -0300)
commitd2454d6868c357ee65dd683d80ab16f2cc2366fc
treefbb342ab23ff7ef17bb284821dacf6eae4662f4c
parent0cb1020e0cdb63143d3d954d4d9ff3a4bd93e330
Bug 20568: Fix bad resolution conflict with bug 18403

borrowers module permission has now several subpermissions

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
members/apikeys.pl