Koha/koha-tmpl
Henri-Damien LAURENT 36a01ea347 Second CAS version : CAS and non-CAS login can coexist
Conflicts solved :

	C4/Auth.pm
	opac/opac-main.pl
2009-11-23 16:26:35 +01:00
..
intranet-tmpl/prog (bug #3802) fix branch deletion checks 2009-11-23 10:35:25 +01:00
opac-tmpl/prog Second CAS version : CAS and non-CAS login can coexist 2009-11-23 16:26:35 +01:00
favicon.ico
index.html
intranet.html
opac.html
templates.readme