projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5117242) | patch
Auth.pm conflicted merge resolution.
authorJoe Atzberger <joe.atzberger@liblime.com>
Mon, 5 Nov 2007 23:27:13 +0000 (17:27 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Tue, 6 Nov 2007 12:33:27 +0000 (06:33 -0600)
commite0ddd34a4c819ee186fba0ba5edc5896f915f346
treed5e2fc7e34c82584216a01b66d730f6a6cf39290tree | snapshot
parent51172422fe689e5f7942b5f57951b29c82472143commit | diff
Auth.pm conflicted merge resolution.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
C4/Auth.pm diff | blob | history
C4/Auth/Auth_with_ldap.pl [new file with mode: 0755] blob
Main Koha release repository