projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c26ab35) | patch
Bug 10320: (follow-up) remove stray merge conflict marker
authorGalen Charlton <gmc@esilibrary.com>
Sun, 8 Sep 2013 20:45:22 +0000 (20:45 +0000)
committerGalen Charlton <gmc@esilibrary.com>
Sun, 8 Sep 2013 20:45:22 +0000 (20:45 +0000)
commitd3a0e603fb2baa7aef9f1243739b243d0aaff657
treea76009644fc1ab35d4563e1e8570163dae971dbetree | snapshot
parentc26ab35be632e7130a13e94e5767d182a42a2595commit | diff
Bug 10320: (follow-up) remove stray merge conflict marker

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
koha-tmpl/opac-tmpl/prog/en/css/opac.css diff | blob | history
Main Koha release repository