Bug 28220: Deal with merge
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Wed, 5 May 2021 15:37:31 +0000 (17:37 +0200)
committerJonathan Druart <jonathan.druart@bugs.koha-community.org>
Mon, 17 May 2021 10:29:23 +0000 (12:29 +0200)
commitc6b3537ff72262e793cb7a0830a9abcca55012f3
treee39f2557fe338a4048d0c0ed3bb8a58dde329036
parent06fe908a4ed842033f980e58fa62cfb2474a0055
Bug 28220: Deal with merge

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Koha/Patron/Attributes.pm
t/db_dependent/Koha/Patron/Attribute.t