projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a901053 5e1b816)
Merge remote branch 'kc/master' into new/bug_5105
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 10 Nov 2010 22:33:10 +0000 (11:33 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Wed, 10 Nov 2010 22:33:10 +0000 (11:33 +1300)
Conflict fixed

Conflicts:
opac/opac-detail.pl

1  2 
opac/opac-detail.pl patch | diff1 | diff2 | blob | history

diff --cc opac/opac-detail.pl
Simple merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git