projects
/
koha_ffzg
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f6be5ef
d2cf308
)
Merge remote branch 'kc/new/bug_2742' into kcmaster
author
Chris Cormack
<chrisc@catalyst.net.nz>
Mon, 14 Feb 2011 21:04:43 +0000
(10:04 +1300)
committer
Chris Cormack
<chrisc@catalyst.net.nz>
Mon, 14 Feb 2011 21:04:43 +0000
(10:04 +1300)
1
2
koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
Simple merge