chiark
/
gitweb
/
~jdamery
/
ArtibusWiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
db140ab
fcc7643
)
Merge branch 'master' of cleopatra.x.thy.me.uk:/home/jdamery/scm/ArtibusWiki
author
Jonathan David Amery
<jdamery@dorothee.ysolde.ucam.org>
Mon, 12 Jun 2017 16:30:24 +0000
(17:30 +0100)
committer
Jonathan David Amery
<jdamery@dorothee.ysolde.ucam.org>
Mon, 12 Jun 2017 16:30:24 +0000
(17:30 +0100)
Trivial merge