7e62b5f22a
Conflicts: koha-tt/intranet-tmpl/prog/en/includes/messaging-preference-form.inc |
||
---|---|---|
.. | ||
intranet-tmpl/prog | ||
opac-tmpl/prog | ||
favicon.ico | ||
index.html | ||
intranet.html | ||
opac.html | ||
templates.readme |
7e62b5f22a
Conflicts: koha-tt/intranet-tmpl/prog/en/includes/messaging-preference-form.inc |
||
---|---|---|
.. | ||
intranet-tmpl/prog | ||
opac-tmpl/prog | ||
favicon.ico | ||
index.html | ||
intranet.html | ||
opac.html | ||
templates.readme |