]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 937f27e f1663ad)
Merge remote branch 'kc/new/enh/bug_4421' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Fri, 1 Apr 2011 18:15:47 +0000 (07:15 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Fri, 1 Apr 2011 18:15:47 +0000 (07:15 +1300)
commit75aa5398c5582826161aa8b2096b6ffced1e35b6
tree7cc5f40f6c9e6fd6db224630045572482c68f116tree | snapshot
parent937f27e6191f7080acc23c3122f1569e1ea2c024commit | diff
parentf1663ada489cebc95344e165ce2d0f681acdeb5acommit | diff
Merge remote branch 'kc/new/enh/bug_4421' into kcmaster

Conflicts:
C4/XSLT.pm
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/it-IT/necessari/sysprefs.sql
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
installer/data/mysql/updatedatabase.pl
13 files changed:
C4/XSLT.pm diff1 | diff2 | blob | history
installer/data/mysql/de-DE/mandatory/sysprefs.sql diff1 | diff2 | blob | history
installer/data/mysql/en/mandatory/sysprefs.sql diff1 | diff2 | blob | history
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql diff1 | diff2 | blob | history
installer/data/mysql/it-IT/necessari/sysprefs.sql diff1 | diff2 | blob | history
installer/data/mysql/pl-PL/mandatory/sysprefs.sql diff1 | diff2 | blob | history
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql diff1 | diff2 | blob | history
installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql diff1 | diff2 | blob | history
installer/data/mysql/updatedatabase.pl diff1 | diff2 | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref diff1 | diff2 | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl diff1 | diff2 | blob | history
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl diff1 | diff2 | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl diff1 | diff2 | blob | history
Main Koha release repository