]> git.koha-community.org Git - koha.git/commit
Cleanup after conflicted merge
authorChris Cormack <chris@bigballofwax.co.nz>
Tue, 8 Sep 2009 21:34:53 +0000 (09:34 +1200)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 16 Sep 2009 21:19:44 +0000 (23:19 +0200)
commitb747677d252d255f1505ef222b123716b1bad3d8
treee5434ef38e4dad5c3f203c67efa10db4d995da36
parent7bbe9d0ae2e64a88fc7947ae69b4c7d6bfefbeb7
Cleanup after conflicted merge
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl