]> git.koha-community.org Git - koha.git/commit
resolving some simple conflicts
authorfinlayt <finlayt>
Wed, 13 Nov 2002 03:02:45 +0000 (03:02 +0000)
committerfinlayt <finlayt>
Wed, 13 Nov 2002 03:02:45 +0000 (03:02 +0000)
commit00ec3c59f52d8ce1490c54319a44721cd827d518
tree26a6c7581bb44a0d3673e38aaf4dce9dc8966f1e
parent63cb28be6aa94ec38badf0bd9f9fcf533f57d74c
resolving some simple conflicts
C4/Auth.pm
C4/Print.pm
search.pl