]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ea5706 748d0e5)
Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import
authorMichael Vogel <icarus@dabo.de>
Sat, 30 Jan 2016 15:38:06 +0000 (16:38 +0100)
committerMichael Vogel <icarus@dabo.de>
Sat, 30 Jan 2016 15:38:06 +0000 (16:38 +0100)

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