git.koha-community.org Git - koha.git/commit

author	Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
	Mon, 23 Nov 2009 15:26:35 +0000 (16:26 +0100)
committer	Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
	Mon, 23 Nov 2009 15:26:35 +0000 (16:26 +0100)
commit	36a01ea3475b4e0a9967490a2196e71667190ff4
tree	7f5e96d96a9f996b10a5ca38cfde73e8e260b6df	tree \| snapshot
parent	77ab8970f10cf3d8f2d8126a4a1f4c1d64110748	commit \| diff

Second CAS version : CAS and non-CAS login can coexist

Conflicts solved :

C4/Auth.pm
opac/opac-main.pl

Main Koha release repository

C4/Auth.pm		diff \| blob \| history
C4/Auth_with_cas.pm		diff \| blob \| history
installer/data/mysql/atomicupdate/0005-Add_CAS_Configuration.pl	[new file with mode: 0644]	blob
installer/data/mysql/en/mandatory/sysprefs.sql		diff \| blob \| history
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl		diff \| blob \| history
koha-tmpl/opac-tmpl/prog/en/modules/opac-main.tmpl		diff \| blob \| history
opac/opac-main.pl		diff \| blob \| history