projects
/
koha.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e62f58
d3d7ac9
)
Merge branch 'bug_8641' into 3.12-master
author
Jared Camins-Esakov
<jcamins@cpbibliography.com>
Sun, 2 Dec 2012 21:36:16 +0000
(16:36 -0500)
committer
Jared Camins-Esakov
<jcamins@cpbibliography.com>
Sun, 2 Dec 2012 21:36:16 +0000
(16:36 -0500)
1
2
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
Simple merge