Chris Cormack 8e00f55216 Merge remote branch 'kc/master' into new/enh/bug_5917 ... Conflicts: installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql		2011-03-30 20:53:45 +13:00
..
intranet-tmpl/prog	Bug 5548: Hard Due Dates Circ Rule	2011-03-30 20:35:45 +13:00
opac-tmpl/prog	Merge remote branch 'kc/master' into new/enh/bug_5917	2011-03-30 20:53:45 +13:00
favicon.ico
index.html
intranet.html	fix for #290	2003-04-09 08:40:28 +00:00
opac.html	fix for #290	2003-04-09 08:40:28 +00:00
templates.readme	Added note detailing obsoletion of pathtotemplate() call	2003-06-11 20:14:12 +00:00