Fixed conflicts Conflicts: catalogue/moredetail.pl installer/data/mysql/updatedatabase.pl koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt |
||
|---|---|---|
| .. | ||
| ISBDdetail.pl | ||
| MARCdetail.pl | ||
| cardview.pl | ||
| detail.pl | ||
| detailprint.pl | ||
| export.pl | ||
| image.pl | ||
| imageviewer.pl | ||
| issuehistory.pl | ||
| labeledMARCdetail.pl | ||
| moredetail.pl | ||
| search.pl | ||
| showmarc.pl | ||
| updateitem.pl | ||