]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 26eceaa dea1b06)
Merge remote-tracking branch 'upstream/develop' into 1504-unified-follow
authorMichael Vogel <icarus@dabo.de>
Fri, 10 Apr 2015 09:34:21 +0000 (11:34 +0200)
committerMichael Vogel <icarus@dabo.de>
Fri, 10 Apr 2015 09:34:21 +0000 (11:34 +0200)

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