]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0aeea4 cabb84a)
Merge remote-tracking branch 'upstream/develop' into 1602-diaspora
authorMichael Vogel <icarus@dabo.de>
Sat, 12 Mar 2016 10:06:43 +0000 (11:06 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 12 Mar 2016 10:06:43 +0000 (11:06 +0100)

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