]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1aa225b 32c92cd)
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
authorMichael Vogel <icarus@dabo.de>
Tue, 2 Feb 2016 20:09:08 +0000 (21:09 +0100)
committerMichael Vogel <icarus@dabo.de>
Tue, 2 Feb 2016 20:09:08 +0000 (21:09 +0100)

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