projects
/
koha_fer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
79b0b76
6eac528
)
Merge remote-tracking branch 'origin/new/bug_6132'
author
Paul Poulain
<paul.poulain@biblibre.com>
Mon, 16 Jan 2012 13:53:08 +0000
(14:53 +0100)
committer
Paul Poulain
<paul.poulain@biblibre.com>
Mon, 16 Jan 2012 13:53:08 +0000
(14:53 +0100)
1
2
C4/Context.pm
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
C4/Context.pm
Simple merge