Bug 10363: FIX rebase conflict error
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Tue, 4 Aug 2015 13:24:50 +0000 (14:24 +0100)
committerTomas Cohen Arazi <tomascohen@theke.io>
Mon, 19 Oct 2015 15:46:28 +0000 (12:46 -0300)
commit7f0202ab8434eb9865d2357a84c9b28868315ca5
treee090159bd06f1b6332e0805156a237eeeb962294
parent11b9f584e0985c4e751e7b92df2cbaaa6e6c120b
Bug 10363: FIX rebase conflict error

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
admin/authorised_values.pl