projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95bf6fb b96c8b7)
Merge remote-tracking branch 'origin/new/bug_6199'
authorPaul Poulain <paul.poulain@biblibre.com>
Wed, 28 Mar 2012 15:54:55 +0000 (17:54 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Wed, 28 Mar 2012 15:54:55 +0000 (17:54 +0200)
1  2 
C4/Biblio.pm patch | diff1 | diff2 | blob | history
C4/Items.pm patch | diff1 | diff2 | blob | history

diff --cc C4/Biblio.pm
Simple merge
diff --cc C4/Items.pm
Simple merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git