projects
/
friendica.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
87ade53
40bff1a
)
Merge remote-tracking branch 'upstream/develop' into 1506-ostatus-evenbetter
author
Michael Vogel
<icarus@dabo.de>
Wed, 24 Jun 2015 19:05:38 +0000
(21:05 +0200)
committer
Michael Vogel
<icarus@dabo.de>
Wed, 24 Jun 2015 19:05:38 +0000
(21:05 +0200)
Trivial merge