Galen Charlton 8ad2c7d7ac Merge commit 'pianohacker-koha/prefs-submit' into master ... Merge in Jesse Weaver's system preference editor changes. Conflicts: C4/Bookfund.pm koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl Signed-off-by: Galen Charlton <gmcharlt@gmail.com>		2010-01-26 20:26:17 -05:00
..
intranet-tmpl/prog	Merge commit 'pianohacker-koha/prefs-submit' into master	2010-01-26 20:26:17 -05:00
opac-tmpl/prog	Fixes for Bug 3943, Show add to cart link when lists off in the OPAC	2010-01-26 15:36:51 -05:00
favicon.ico
index.html
intranet.html
opac.html
robots.txt	Add basic restrictive robots.txt file to opac	2009-12-20 14:27:44 +01:00
templates.readme