projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c3f6f26) | patch
Bug 7663: Fix bad merge conflict with bug 15584
authorJonathan Druart <jonathan.druart@bugs.koha-community.org>
Fri, 24 Feb 2017 07:46:19 +0000 (07:46 +0000)
committerKyle M Hall <kyle@bywatersolutions.com>
Fri, 3 Mar 2017 18:18:14 +0000 (18:18 +0000)
commit3f6f4a2b36537cdcf3e89832e83595d7d6a649ad
treef8044ba74939f204f6f46761f6610e6f770803c7tree | snapshot
parentc3f6f26c35ecdab035f8e0035ee8eb73cd5fe99ccommit | diff
Bug 7663: Fix bad merge conflict with bug 15584

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
virtualshelves/shelves.pl diff | blob | history
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git