]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee7f10f 2a088d2)
Merge remote-tracking branch 'upstream/develop' into 1607-new-probe
authorMichael Vogel <icarus@dabo.de>
Mon, 11 Jul 2016 18:45:56 +0000 (20:45 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 11 Jul 2016 18:45:56 +0000 (20:45 +0200)

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