projects
/
friendica-addons.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bed435d
b4184c2
)
Merge remote-tracking branch 'upstream/master' into 1601-gcontact
author
Michael Vogel
<icarus@dabo.de>
Fri, 8 Jan 2016 12:20:04 +0000
(13:20 +0100)
committer
Michael Vogel
<icarus@dabo.de>
Fri, 8 Jan 2016 12:20:04 +0000
(13:20 +0100)
Trivial merge