projects
/
koha_fer
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
80446e9
a1c9272
)
Merge branch 'bug_8557' into 3.12-master
author
Jared Camins-Esakov
<jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:08:49 +0000
(23:08 -0500)
committer
Jared Camins-Esakov
<jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:08:49 +0000
(23:08 -0500)
1
2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
patch
|
diff1
|
diff2
|
blob
|
history
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
Simple merge
diff --cc
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
Simple merge