projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4ffd2d3) | patch
Bug 20996: (follow-up) Fix merge problems
authorAndrew Isherwood <andrew.isherwood@ptfs-europe.com>
Wed, 31 Oct 2018 15:25:17 +0000 (15:25 +0000)
committerNick Clemens <nick@bywatersolutions.com>
Fri, 2 Nov 2018 10:33:06 +0000 (10:33 +0000)
commitf947655862abc813df685d51edbfbe7b34027178
treeb4eff57086e7cb53f1cd5ff215904ea5eefad2eetree | snapshot
parent4ffd2d3b347072f6422adb98608859264ba269d6commit | diff
Bug 20996: (follow-up) Fix merge problems

Merge conflicts resolved

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Koha/Illrequest.pm diff | blob | history
Koha/REST/V1/Illrequests.pm diff | blob | history
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git