]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c15b7d8 d87323c)
Merge remote-tracking branch 'upstream/develop' into 1409-shadow-items
authorMichael Vogel <icarus@dabo.de>
Fri, 26 Dec 2014 17:07:37 +0000 (18:07 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 26 Dec 2014 17:07:37 +0000 (18:07 +0100)

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