Jonathan Druart
4c45a5011b
Fix bad merge conflict with bug 12904 Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> |
||
---|---|---|
.. | ||
intranet-tmpl | ||
opac-tmpl | ||
favicon.ico | ||
index.html | ||
intranet.html | ||
opac.html |
Jonathan Druart
4c45a5011b
Fix bad merge conflict with bug 12904 Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> |
||
---|---|---|
.. | ||
intranet-tmpl | ||
opac-tmpl | ||
favicon.ico | ||
index.html | ||
intranet.html | ||
opac.html |