projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
afed5f3
d6c1889
)
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
author
Michael Vogel
<icarus@dabo.de>
Wed, 27 Jan 2016 12:16:28 +0000
(13:16 +0100)
committer
Michael Vogel
<icarus@dabo.de>
Wed, 27 Jan 2016 12:16:28 +0000
(13:16 +0100)
Trivial merge
projects / friendica.git / commitdiff