Galen Charlton
8ad2c7d7ac
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> |
||
---|---|---|
.. | ||
pages | ||
treeview | ||
addbiblio.css | ||
blue.css | ||
card.css | ||
help.css | ||
hierarchy.css | ||
humanmsg.css | ||
intranet-print.css | ||
intranet.css | ||
intranet2.css | ||
intranet2popup.css | ||
label.css | ||
login.css | ||
preferences.css | ||
print.css | ||
spinelabel.css | ||
staff-global.css | ||
staff-global2.css |