projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
483f34c
1d0cb0f
)
Merge remote-tracking branch 'upstream/develop' into 1612-diaspora
author
Michael
<heluecht@pirati.ca>
Thu, 29 Dec 2016 10:16:10 +0000
(10:16 +0000)
committer
Michael
<heluecht@pirati.ca>
Thu, 29 Dec 2016 10:16:10 +0000
(10:16 +0000)
Trivial merge