projects
/
koha.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c8df08
7639cd8
)
Merge remote-tracking branch 'origin/new/bug_7143'
author
Paul Poulain
<paul.poulain@biblibre.com>
Fri, 6 Apr 2012 13:12:28 +0000
(15:12 +0200)
committer
Paul Poulain
<paul.poulain@biblibre.com>
Fri, 6 Apr 2012 13:12:28 +0000
(15:12 +0200)
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