]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 778ed77 3a0b18f)
Merge remote-tracking branch 'upstream/master' into 1409-diaspora-repeated-twitter...
authorMichael Vogel <icarus@dabo.de>
Mon, 29 Sep 2014 07:42:47 +0000 (09:42 +0200)
committerMichael Vogel <icarus@dabo.de>
Mon, 29 Sep 2014 07:42:47 +0000 (09:42 +0200)

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