projects / koha-equinox.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8a7a953) | patch
Bug 11360 - Fix merge conflict
authorKyle M Hall <kyle@bywatersolutions.com>
Sat, 3 Sep 2016 00:17:20 +0000 (00:17 +0000)
committerKyle M Hall <kyle@bywatersolutions.com>
Sat, 3 Sep 2016 00:17:20 +0000 (00:17 +0000)
commit3a2048eeff57548a7d9b557b0e94d36d1c58e6ef
treeaba22b01dc3bef9db13081b482934d4c2476ebd8tree | snapshot
parent8a7a953e5b6c03da01963b47eb963bab73643245commit | diff
Bug 11360 - Fix merge conflict

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt diff | blob | history
Koha with Equinox developments in process and local tweaks