projects
/
koha.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f87085e
0e5b3f3
)
Merge remote-tracking branch 'origin/new/bug_2780'
author
Paul Poulain
<paul.poulain@biblibre.com>
Tue, 10 Apr 2012 08:04:51 +0000
(10:04 +0200)
committer
Paul Poulain
<paul.poulain@biblibre.com>
Tue, 10 Apr 2012 08:04:51 +0000
(10:04 +0200)
1
2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
patch
|
diff1
|
diff2
|
blob
|
history
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
Simple merge
diff --cc
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
Simple merge