]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f918109 c67fbc8)
Merge remote-tracking branch 'upstream/develop' into 1509-diaspora-import
authorMichael Vogel <icarus@dabo.de>
Sun, 6 Sep 2015 07:15:23 +0000 (09:15 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 6 Sep 2015 07:15:23 +0000 (09:15 +0200)

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