projects
/
koha-ffzg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a117597
8ee8811
)
Merge branch 'master' of /home/jmf/repos/koha-rm-root.git/
author
Chris Cormack
<crc@liblime.com>
Wed, 8 Aug 2007 12:36:43 +0000
(07:36 -0500)
committer
Chris Cormack
<crc@liblime.com>
Wed, 8 Aug 2007 12:36:43 +0000
(07:36 -0500)
1
2
koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl
patch
|
diff1
|
diff2
|
blob
|
history
koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
patch
|
diff1
|
diff2
|
blob
|
history
misc/zebra/ccl.properties
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl
Simple merge
diff --cc
koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
Simple merge
diff --cc
misc/zebra/ccl.properties
Simple merge
projects / koha-ffzg.git / commitdiff