projects
/
koha_fer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d00d072
49af98a
)
Merge remote branch 'kc/new/enh/bug_5952' into kcmaster
author
Chris Cormack
<chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 02:41:25 +0000
(14:41 +1200)
committer
Chris Cormack
<chrisc@catalyst.net.nz>
Thu, 14 Apr 2011 02:41:25 +0000
(14:41 +1200)
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