Koha/koha-tmpl
Chris Cormack 75aa5398c5 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
2011-04-02 07:15:47 +13:00
..
intranet-tmpl/prog Merge remote branch 'kc/new/enh/bug_4421' into kcmaster 2011-04-02 07:15:47 +13:00
opac-tmpl/prog Merge remote branch 'kc/new/enh/bug_4421' into kcmaster 2011-04-02 07:15:47 +13:00
favicon.ico
index.html
intranet.html
opac.html
templates.readme