Chris Cormack 76184e1db0 Merge remote branch 'kc/master' into new/enh/bug_5917 ... Conflicts: installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql		2011-03-30 08:39:10 +13:00
..
intranet-tmpl/prog	Bug 5838: Format sql outout on guided reports	2011-03-29 09:53:02 +13:00
opac-tmpl/prog	Merge remote branch 'kc/master' into new/enh/bug_5917	2011-03-30 08:39:10 +13:00
favicon.ico
index.html
intranet.html
opac.html
templates.readme