projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9295e47 d83596a)
Merge remote-tracking branch 'origin/new/bug_7178'
authorPaul Poulain <paul.poulain@biblibre.com>
Mon, 14 May 2012 14:18:46 +0000 (16:18 +0200)
committerPaul Poulain <paul.poulain@biblibre.com>
Mon, 14 May 2012 14:18:46 +0000 (16:18 +0200)
1  2 
C4/Items.pm patch | diff1 | diff2 | blob | history
acqui/neworderempty.pl patch | diff1 | diff2 | blob | history

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