Koha/koha-tmpl/opac-tmpl/prog
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
..
en Merge remote branch 'kc/new/enh/bug_4421' into kcmaster 2011-04-02 07:15:47 +13:00
famfamfam Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506 2010-12-14 21:07:15 +13:00
images Fix for Bug 3347 - Inconsistencies with tables in opac-shelves.tmpl 2011-01-06 08:40:49 +13:00
itemtypeimg Bug 5792 - Add reference icon to Bridge icon set 2011-03-04 12:54:20 +13:00