projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b429229
595ca3b
)
Merge branch 'develop' into 'mastopost'
author
lambda
<pleromagit@rogerbraun.net>
Thu, 7 Jun 2018 16:29:33 +0000
(16:29 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Thu, 7 Jun 2018 16:29:33 +0000
(16:29 +0000)
# Conflicts:
# .gitignore
Trivial merge