]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a65547c b4b2a6d)
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
authorMichael Vogel <icarus@dabo.de>
Thu, 7 Jul 2016 21:35:14 +0000 (23:35 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 7 Jul 2016 21:35:14 +0000 (23:35 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.