projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 012c6df dc1d934)
Merge remote-tracking branch 'origin/new/bug_7016'
authorPaul Poulain <paul.poulain@biblibre.com>
Wed, 18 Apr 2012 14:54:44 +0000 (16:54 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Wed, 18 Apr 2012 14:54:44 +0000 (16:54 +0200)
1  2 
C4/Items.pm patch | diff1 | diff2 | blob | history
C4/Reserves.pm patch | diff1 | diff2 | blob | history

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